commit a0a073864a8948fc016bbfd26a04a7374d6a2c73
author Ricky Wai <rickywai@google.com> Tue Apr 12 17:34:59 2016 +0100
committer Ricky Wai <rickywai@google.com> Tue Apr 12 17:34:59 2016 +0100
tree e614372a80e788c0f720c022c3f4f22817a3b468
parent 2f99770cc178011de27813398364da20283fce47

Do not update unified setting before updating primary profile lock

Bug: 28135945
Change-Id: Ib6332f42d3b6416d8fd08d5f829bf9852fa0e9f0

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 0c3260f..bcb677d 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -706,8 +706,6 @@
     private void unifyLocks() {
         int profileQuality =
                 mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId);
-        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
-                mCurrentProfilePassword);
         if (profileQuality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
             mLockPatternUtils.saveLockPattern(
                     LockPatternUtils.stringToPattern(mCurrentProfilePassword),
@@ -717,6 +715,8 @@
                     mCurrentProfilePassword, mCurrentDevicePassword,
                     profileQuality, MY_USER_ID);
         }
+        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
+                mCurrentProfilePassword);
         final boolean profilePatternVisibility =
                 mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
         mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);