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

[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off

Browse Source 
- Fix the logic to set the pin_auto_confirm setting before triggering the password save workflow in ChooseLockPassword

Bug: 275385372
Test: atest AutoPinConfirmPreferenceControllerTest
Test: Manual Test
Change-Id: Id6774bc9afcd6d3161e023dc52911ae3e1f556c9
This commit is contained in:
Avinash Vadlamudi
2023-03-27 18:46:08 +00:00
parent cdfd4ee9b3
commit a4cf551d25
5 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,10 +16,14 @@
package com.android.settings.security.screenlock;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.UserHandle;
import androidx.annotation.Nullable;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -38,6 +42,10 @@ public class ScreenLockSettings extends DashboardFragment
private static final String TAG = "ScreenLockSettings";
private static final int MY_USER_ID = UserHandle.myUserId();
static final int AUTO_PIN_SETTING_ENABLING_REQUEST_CODE = 111;
static final int AUTO_PIN_SETTING_DISABLING_REQUEST_CODE = 112;
private LockPatternUtils mLockPatternUtils;
@Override
@@ -79,7 +87,7 @@ public class ScreenLockSettings extends DashboardFragment
controllers.add(new LockAfterTimeoutPreferenceController(
context, MY_USER_ID, lockPatternUtils));
controllers.add(new AutoPinConfirmPreferenceController(
context, MY_USER_ID, lockPatternUtils));
context, MY_USER_ID, lockPatternUtils, parent));
controllers.add(new OwnerInfoPreferenceController(context, parent));
return controllers;
}
@@ -94,4 +102,17 @@ public class ScreenLockSettings extends DashboardFragment
new LockPatternUtils(context));
}
};
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (requestCode == AUTO_PIN_SETTING_ENABLING_REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) {
mLockPatternUtils.setAutoPinConfirm(/* enabled= */ true, MY_USER_ID);
}
} else if (requestCode == AUTO_PIN_SETTING_DISABLING_REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) {
mLockPatternUtils.setAutoPinConfirm(/* enabled= */ false, MY_USER_ID);
}
}
}
}