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

Commit 8e91558c authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

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

parents eb729005 a0a07386

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);