Merge "Fix: 'Make profile pattern visible'" into nyc-dev

2016-03-04 18:01:07 +00:00
parent abd0ff950b a1276e4956
commit 0f20f969b8
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -117,7 +117,9 @@ public class SecuritySettings extends SettingsPreferenceFragment

    // These switch preferences need special handling since they're not all stored in Settings.
    private static final String SWITCH_PREFERENCE_KEYS[] = {
-            KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS, KEY_UNIFICATION };
+            KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS, KEY_UNIFICATION,
+            KEY_VISIBLE_PATTERN_PROFILE
+    };

    // Only allow one trust agent on the platform.
    private static final boolean ONLY_ONE_TRUST_AGENT = true;