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

Commit a1f92b7c authored by Scott Mertz's avatar Scott Mertz Committed by Roman Birg
Browse files

Settings: use the actual user id to set pattern size 

Ticket: CYNGNOS-2462
Change-Id: I1af2b69dabdc0aa010edb354c6274af57b442618
(cherry picked from commit fd772742)
parent 88d76a5e

src/com/android/settings/ChooseLockPattern.java

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        protected Intent saveAndVerifyInBackground() {

            Intent result = null;

            final int userId = UserHandle.myUserId();

            mUtils.setLockPatternSize(mPatternSize);

            mUtils.setLockPatternSize(mPatternSize, userId);

            mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);



            if (mHasChallenge) {

src/com/android/settings/ConfirmLockPattern.java

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                    mLockPatternUtils.isTactileFeedbackEnabled());

            mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(

                    mEffectiveUserId));

            mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize());

            mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize(mEffectiveUserId));

            mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);

            updateStage(Stage.NeedToUnlock);
@@ -459,7 +459,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,

                                                    StorageManager.CRYPT_TYPE_PATTERN);

                                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,

                                                    mLockPatternUtils.patternToString(pattern));

                                                    mLockPatternUtils.patternToString(pattern, localEffectiveUserId));

                                }

                                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,

                                        localEffectiveUserId);