Merge "ChooseLockPattern: remove redundant setting of visible pattern default"

This commit is contained in:
Eric Biggers
2023-05-02 23:41:38 +00:00
committed by Android (Google) Code Review

View File

@@ -873,7 +873,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,
@@ -885,8 +884,6 @@ public class ChooseLockPattern extends SettingsActivity {
mChosenPattern = chosenPattern;
mUserId = userId;
mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
start();
}
@@ -917,14 +914,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);
}
}
}