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

Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-14 20:46:49 +00:00
committed by Android (Google) Code Review
parent bba66e54b3 7183e83b0b
commit e1ae1c6516
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

@@ -107,12 +107,21 @@ public class ScreenLockSettings extends DashboardFragment
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (requestCode == AUTO_PIN_SETTING_ENABLING_REQUEST_CODE) { if (requestCode == AUTO_PIN_SETTING_ENABLING_REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
mLockPatternUtils.setAutoPinConfirm(/* enabled= */ true, MY_USER_ID); onAutoPinConfirmSettingChange(/* newState= */ true);
} }
} else if (requestCode == AUTO_PIN_SETTING_DISABLING_REQUEST_CODE) { } else if (requestCode == AUTO_PIN_SETTING_DISABLING_REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
mLockPatternUtils.setAutoPinConfirm(/* enabled= */ false, MY_USER_ID); onAutoPinConfirmSettingChange(/* newState= */ false);
} }
} }
} }
private void onAutoPinConfirmSettingChange(boolean newState) {
// update the auto pin confirm setting.
mLockPatternUtils.setAutoPinConfirm(newState, MY_USER_ID);
// store the pin length info to disk; If it fails, reset the setting to prev state.
if (!mLockPatternUtils.refreshStoredPinLength(MY_USER_ID)) {
mLockPatternUtils.setAutoPinConfirm(!newState, MY_USER_ID);
}
}
} }