PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c

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

Change-Id: Ife2292b6bfa6c032701c1f44e4f40e969d83e929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-08-11 01:37:55 +00:00
committed by Automerger Merge Worker
parent ecca6508da 71814b355c
commit fdf07d6c35
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -878,7 +878,6 @@ public class ChooseLockPattern extends SettingsActivity {
private LockscreenCredential mChosenPattern; private LockscreenCredential mChosenPattern;
private LockscreenCredential mCurrentCredential; private LockscreenCredential mCurrentCredential;
private boolean mLockVirgin;
public void start(LockPatternUtils utils, boolean requestGatekeeperPassword, public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
LockscreenCredential chosenPattern, LockscreenCredential currentCredential, LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
@@ -890,8 +889,6 @@ public class ChooseLockPattern extends SettingsActivity {
mChosenPattern = chosenPattern; mChosenPattern = chosenPattern;
mUserId = userId; mUserId = userId;
mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
start(); start();
} }
@@ -922,14 +919,5 @@ public class ChooseLockPattern extends SettingsActivity {
} }
return Pair.create(success, result); return Pair.create(success, result);
} }
@Override
protected void finish(Intent resultData) {
if (mLockVirgin) {
mUtils.setVisiblePatternEnabled(true, mUserId);
}
super.finish(resultData);
}
} }
} }