Fix crash when changing encrypt with credential

Bug: 27173979 Change-Id: If8ef7a9342bcb1b0602791df1dc7634b3e980ee7
2016-02-25 15:43:24 -08:00
parent b671780528
commit 77181e9478
3 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -1054,6 +1054,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
        static boolean canChangeRequireCredentialBeforeStartup(Context context) {
            DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
            return UserManager.get(context).isAdminUser()
+                    && UserManager.get(context).isPrimaryUser()
                    && LockPatternUtils.isDeviceEncryptionEnabled()
                    && !dpm.getDoNotAskCredentialsOnBoot();
        }