Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d93fba authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Do not update unified setting before updating primary profile lock" into nyc-dev 

am: 8e91558c

* commit '8e91558c':
  Do not update unified setting before updating primary profile lock

Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d
parents 6e7b0956 8e91558c

src/com/android/settings/SecuritySettings.java

+2 −2
Original line number Diff line number Diff line
@@ -706,8 +706,6 @@ public class SecuritySettings extends SettingsPreferenceFragment 
    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 @@ public class SecuritySettings extends SettingsPreferenceFragment 
                    mCurrentProfilePassword, mCurrentDevicePassword,

                    profileQuality, MY_USER_ID);

        }

        mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,

                mCurrentProfilePassword);

        final boolean profilePatternVisibility =

                mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);

        mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);