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

Commit 99abeaee authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-first" into main am: 137235a2... 

Merge changes from topic "locksettings-aosp-first" into main am: 137235a2 am: 71814b35 am: fdf07d6c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640



Change-Id: Ic208bc0ed3d9ff73a77fed35bc4cdc501f41e149
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47e19db8 fdf07d6c

src/com/android/settings/password/ChooseLockPattern.java

+0 −12
Original line number Diff line number Diff line
@@ -872,7 +872,6 @@ public class ChooseLockPattern extends SettingsActivity { 


        private LockscreenCredential mChosenPattern;

        private LockscreenCredential mCurrentCredential;

        private boolean mLockVirgin;



        public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,

                LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
@@ -884,8 +883,6 @@ public class ChooseLockPattern extends SettingsActivity { 
            mChosenPattern = chosenPattern;

            mUserId = userId;



            mLockVirgin = !mUtils.isPatternEverChosen(mUserId);



            start();

        }
@@ -916,14 +913,5 @@ public class ChooseLockPattern extends SettingsActivity { 
            }

            return Pair.create(success, result);

        }



        @Override

        protected void finish(Intent resultData) {

            if (mLockVirgin) {

                mUtils.setVisiblePatternEnabled(true, mUserId);

            }



            super.finish(resultData);

        }

    }

}