ChooseLockPattern: remove redundant setting of visible pattern default
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136). The explicit defaulting to true was only needed
before because the low-level default value was wrong.
Bug: 270013005
Test: Set a pattern. Verified that Keyguard uses visible pattern.
Disabled the "Make pattern visible" option in Settings. Verified
that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086d37947d11dca146354dca33a935755)
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index c0342d1..e1e7047 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -889,7 +889,6 @@
private LockscreenCredential mChosenPattern;
private LockscreenCredential mCurrentCredential;
- private boolean mLockVirgin;
public void start(LockPatternUtils utils, boolean credentialRequired,
boolean requestGatekeeperPassword, LockscreenCredential chosenPattern,
@@ -901,8 +900,6 @@
mChosenPattern = chosenPattern;
mUserId = userId;
- mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
-
start();
}
@@ -933,14 +930,5 @@
}
return Pair.create(success, result);
}
-
- @Override
- protected void finish(Intent resultData) {
- if (mLockVirgin) {
- mUtils.setVisiblePatternEnabled(true, mUserId);
- }
-
- super.finish(resultData);
- }
}
}