From 582005f3f6e000a3b35960723eb9d3f6acb9dc7a Mon Sep 17 00:00:00 2001
From: sandarudr <sandarudr@gmail.com>
Date: Fri, 24 May 2019 14:55:54 +0530
Subject: [PATCH] Remove unnecessary policies

---
 .../public/js/operation-bar.js                     |  2 --
 .../public/js/operation-mod.js                     |  5 -----
 .../public/templates/android-policy-edit.hbs       | 13 -------------
 .../public/templates/android-policy-view.hbs       | 14 +-------------
 .../public/templates/android-policy-operations.hbs | 12 ------------
 .../mobile/android/impl/AndroidFeatureManager.java |  6 ------
 .../src/main/resources/devicetypes/android.xml     |  4 ----
 7 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
index 03ea85da5..e8a99b80e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
@@ -338,7 +338,6 @@ var generatePayload = function (operationCode, operationData, deviceList) {
                     "AUTO_TIME": operationData["enableAutoTime"],
                     "SET_SCREEN_CAPTURE_DISABLED": operationData["disableScreenCapture"],
                     "SET_STATUS_BAR_DISABLED": operationData["disableStatusBar"],
-                    "KEY_RESTRICTIONS_PENDING": operationData["keyRestrictionsPending"],
                     "DISALLOW_SET_WALLPAPER": operationData["disallowSetWallpaper"],
                     "DISALLOW_SET_USER_ICON": operationData["disallowSetUserIcon"],
                     "DISALLOW_REMOVE_MANAGEMENT_PROFILE": operationData["disallowRemoveManagedProfile"],
@@ -574,7 +573,6 @@ var androidOperationConstants = {
     "KIOSK_APPS_CODE": "KIOSK_APPS",
     "FILE_TRANSFER": "FILE_TRANSFER",
     "APP_RESTRICTION_OPERATION_CODE": "REMOTE_APP_CONFIG",
-    "KEY_RESTRICTIONS_PENDING": "KEY_RESTRICTIONS_PENDING",
     "DISALLOW_SET_WALLPAPER": "DISALLOW_SET_WALLPAPER",
     "DISALLOW_SET_USER_ICON": "DISALLOW_SET_USER_ICON",
     "DISALLOW_REMOVE_MANAGEMENT_PROFILE": "DISALLOW_REMOVE_MANAGEMENT_PROFILE",
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
index 9a7309233..291e71d40 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
@@ -100,7 +100,6 @@ var androidOperationModule = function () {
         "COSU_PROFILE_CONFIGURATION_OPERATION": "cosu-profile-configuration",
         "COSU_PROFILE_CONFIGURATION_OPERATION_CODE": "COSU_PROFILE",
         "ENROLLMENT_APP_INSTALL": "enrollment-app-install",
-        "KEY_RESTRICTIONS_PENDING": "KEY_RESTRICTIONS_PENDING",
         "DISALLOW_SET_WALLPAPER": "DISALLOW_SET_WALLPAPER",
         "DISALLOW_SET_USER_ICON": "DISALLOW_SET_USER_ICON",
         "DISALLOW_REMOVE_MANAGEMENT_PROFILE": "DISALLOW_REMOVE_MANAGEMENT_PROFILE",
@@ -352,7 +351,6 @@ var androidOperationModule = function () {
                         "ENSURE_VERIFY_APPS": operationData["ensureVerifyApps"],
                         "AUTO_TIME": operationData["enableAutoTime"],
                         "SET_SCREEN_CAPTURE_DISABLED": operationData["disableScreenCapture"],
-                        "KEY_RESTRICTIONS_PENDING": operationData["keyRestrictionsPending"],
                         "DISALLOW_SET_WALLPAPER": operationData["disallowSetWallpaper"],
                         "DISALLOW_SET_USER_ICON": operationData["disallowSetWallpaper"],
                         "DISALLOW_REMOVE_MANAGEMENT_PROFILE": operationData["disallowRemoveManagedProfile"],
@@ -1216,9 +1214,6 @@ var androidOperationModule = function () {
             } else if (featureCode == androidOperationConstants["SET_STATUS_BAR_DISABLED"]) {
                 restrictions["disableStatusBar"] = restriction["enabled"];
                 continue;
-            }else if (featureCode == androidOperationConstants["KEY_RESTRICTIONS_PENDING"]) {
-                restrictions["keyRestrictionsPending"] = restriction["enabled"];
-                continue;
             }else if (featureCode == androidOperationConstants["DISALLOW_SET_WALLPAPER"]) {
                 restrictions["disallowSetWallpaper"] = restriction["enabled"];
                 continue;
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index ac49af29e..7a65d49f2 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -495,19 +495,6 @@
                             </span>
                         </label>
                     </div>
-<!--                        <br>-->
-<!--                        <div class="wr-input-control">-->
-<!--                            <label class="wr-input-control checkbox">-->
-<!--                                <input id="key_restrictions_pending" type="checkbox"-->
-<!--                                       class="operationDataKeys"-->
-<!--                                       data-key="keyRestrictionsPending"/>-->
-<!--                                <span class="helper"-->
-<!--                                      title="Allows apps in the parent profile to access or handle web links from the managed profile.">-->
-<!--                                Key restrictions pending-->
-<!--                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-<!--                            </span>-->
-<!--                            </label>-->
-<!--                        </div>-->
                         <br>
                         <div>
                             <ul class="message message-info">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index 6b1c66e17..9a92054a7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -729,19 +729,7 @@
                             </span>
                         </label>
                     </div>
-<!--                    <br>-->
-
-<!--                     <div class="wr-input-control">-->
-<!--                        <label class="wr-input-control checkbox">-->
-<!--                            <input id="key_restrictions_pending" type="checkbox"-->
-<!--                                   class="operationDataKeys"-->
-<!--                                   data-key="keyRestrictionsPending" disabled/>-->
-<!--                            <span class="helper" title="Allows apps in the parent profile to access or handle web links from the managed profile.">-->
-<!--                                Key restrictions pending-->
-<!--                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-<!--                            </span>-->
-<!--                    </label>-->
-<!--                </div>-->
+
                     <br>
                     <br>
                     <b>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index ad289d9fa..212f334b9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -505,18 +505,6 @@
                             </span>
                             </label>
                         </div>
-<!--                    <br>-->
-<!--                        <div class="wr-input-control worker-profile-or-owner">-->
-<!--                            <label class="wr-input-control checkbox">-->
-<!--                                <input id="key_restrictions_pending" type="checkbox"-->
-<!--                                       class="operationDataKeys"-->
-<!--                                       data-key="keyRestrictionsPending"/>-->
-<!--                                <span class="helper" title="Allows apps in the parent profile to access or handle web links from the managed profile.">-->
-<!--                                Key restrictions pending-->
-<!--                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-<!--                            </span>-->
-<!--                            </label>-->
-<!--                        </div>-->
                         <br>
                         <div class="">
                             <ul class="message message-info">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
index 70ff5d4e0..6af4e16ab 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidFeatureManager.java
@@ -469,12 +469,6 @@ public class AndroidFeatureManager implements FeatureManager {
         feature.setDescription("Unlock the device");
         supportedFeatures.add(feature);
 
-        feature = new Feature();
-        feature.setCode("KEY_RESTRICTIONS_PENDING");
-        feature.setName("Device Unlock");
-        feature.setDescription("Unlock the device");
-        supportedFeatures.add(feature);
-
         feature = new Feature();
         feature.setCode("DISALLOW_SET_WALLPAPER");
         feature.setName("Device Unlock");
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 002546d33..6fccf219f 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -343,10 +343,6 @@
             <Name>Fetch device logcat</Name>
             <Description>Fetch device logcat</Description>
         </Feature>
-        <Feature code="KEY_RESTRICTIONS_PENDING">
-            <Name>Fetch device logcat</Name>
-            <Description>Fetch device logcat</Description>
-        </Feature>
         <Feature code="DISALLOW_SET_WALLPAPER">
             <Name>Fetch device logcat</Name>
             <Description>Fetch device logcat</Description>