Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c am: fdf07d6c35
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640
Change-Id: Ic208bc0ed3d9ff73a77fed35bc4cdc501f41e149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index a2fd986..a5d04cc 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -872,7 +872,6 @@
private LockscreenCredential mChosenPattern;
private LockscreenCredential mCurrentCredential;
- private boolean mLockVirgin;
public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
@@ -884,8 +883,6 @@
mChosenPattern = chosenPattern;
mUserId = userId;
- mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
-
start();
}
@@ -916,14 +913,5 @@
}
return Pair.create(success, result);
}
-
- @Override
- protected void finish(Intent resultData) {
- if (mLockVirgin) {
- mUtils.setVisiblePatternEnabled(true, mUserId);
- }
-
- super.finish(resultData);
- }
}
}