Merge "Change KEYGUARD_PREFERENCES to KEYGUARD_FEATURES" into ub-testdpc-nyc

Author: Mahaver Chopra

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -216,7 +216,6 @@ public class PolicyManagementFragment extends PreferenceFragment implements
     private static final String INSTALL_KEY_CERTIFICATE_KEY = "install_key_certificate";
     private static final String INSTALL_NONMARKET_APPS_KEY
             = "install_nonmarket_apps";
-    private static final String KEYGUARD_PREFERENCES = "keyguard_preferences";
     private static final String LOCK_SCREEN_POLICY_KEY = "lock_screen_policy";
     private static final String MANAGE_APP_PERMISSIONS_KEY = "manage_app_permissions";
     private static final String MANAGE_APP_RESTRICTIONS_KEY = "manage_app_restrictions";
@@ -295,13 +294,9 @@ public class PolicyManagementFragment extends PreferenceFragment implements
     };
 
     /**
-     * Preferences that are allowed only in MNC+ if it profile owner. This does not restrict device
-     * owner.
+     * Preferences that are allowed only in NYC+ if it is profile owner. This does not restrict
+     * device owner.
      */
-    private static String[] MANAGED_PROFILE_MNC_PLUS_PREFERENCES = {
-            KEYGUARD_PREFERENCES
-    };
-
     private static String[] MANAGED_PROFILE_NYC_PLUS_PREFERENCES = {
             RESET_PASSWORD_KEY
     };
@@ -1027,11 +1022,6 @@ private void disableIncompatibleManagementOptionsInCurrentProfile() {
             for (String preference : PRIMARY_USER_ONLY_PREFERENCES) {
                 findPreference(preference).setEnabled(false);
             }
-            if (Util.isBeforeM()) {
-                for (String preference : MANAGED_PROFILE_MNC_PLUS_PREFERENCES) {
-                    findPreference(preference).setEnabled(false);
-                }
-            }
             if (Util.isBeforeN()) {
                 for (String preference : MANAGED_PROFILE_NYC_PLUS_PREFERENCES) {
                     findPreference(preference).setEnabled(false);

app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java

@@ -90,6 +90,15 @@ abstract static class Keys {
             LOCK_SCREEN_MESSAGE
         }));
 
+        /**
+         * Preferences that are allowed only in MNC+ if it is profile owner. This does not restrict
+         * device owner.
+         */
+        static final Set<String> PROFILE_OWNER_ONLY_MNC_PLUS
+                = new HashSet<>(Arrays.asList(new String[] {
+            KEYGUARD_FEATURES_CATEGORY
+        }));
+
         static final Set<String> NYC_PLUS
                 = new HashSet<>(Arrays.asList(new String[] {
             LOCK_SCREEN_MESSAGE
@@ -134,6 +143,7 @@ public void onCreate(Bundle savedInstanceState) {
         setup(Keys.MAX_TIME_SCREEN_LOCK,
                 TimeUnit.MILLISECONDS.toSeconds(getDpm().getMaximumTimeToLock(getAdmin())));
 
+        disableIncompatibleManagementOptionsInCurrentProfile();
         final int disabledFeatures = getDpm().getKeyguardDisabledFeatures(getAdmin());
         for (Map.Entry<String, Integer> flag : KEYGUARD_FEATURES.entrySet()) {
             setup(flag.getKey(), (disabledFeatures & flag.getValue()) != 0 ? true : false);
@@ -219,7 +229,9 @@ private void updateAggregates() {
      */
     private void setup(String key, Object adminSetting) {
         Preference pref = findPreference(key);
-
+        if (!pref.isEnabled()) {
+            return;
+        }
         // If the preference is not applicable, just hide it instead.
         if ((Keys.NOT_APPLICABLE_TO_PARENT.contains(key) && isParentProfileInstance())
                 || (Keys.NOT_APPLICABLE_TO_PROFILE.contains(key) && isManagedProfileInstance())
@@ -245,6 +257,14 @@ private void setup(String key, Object adminSetting) {
         pref.setOnPreferenceChangeListener(this);
     }
 
+    private void disableIncompatibleManagementOptionsInCurrentProfile() {
+        if (isProfileOwner() && Util.isBeforeM()) {
+            for (String preference : Keys.PROFILE_OWNER_ONLY_MNC_PLUS) {
+                findPreference(preference).setEnabled(false);
+            }
+        }
+    }
+
     private int parseInt(String value) throws NumberFormatException {
         return value.length() != 0 ? Integer.parseInt(value) : 0;
     }
@@ -257,6 +277,10 @@ private boolean isDeviceOwner() {
         return getDpm().isDeviceOwnerApp(getContext().getPackageName());
     }
 
+    private boolean isProfileOwner() {
+        return getDpm().isProfileOwnerApp(getContext().getPackageName());
+    }
+
     private void showToast(int titleId) {
         Toast.makeText(getActivity(), titleId, Toast.LENGTH_SHORT).show();
     }