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

Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: I7fcc3676caa7109a4893b438dcaff444bbec13e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Avinash Vadlamudi
2023-02-23 12:06:02 +00:00
committed by Automerger Merge Worker
parent 550b5a0ba1 2a619718ee
commit 670f1b2718
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -831,7 +831,7 @@ public class ChooseLockPassword extends SettingsActivity {
mIsAlphaMode
? R.string.lockpassword_password_too_short
: R.string.lockpassword_pin_too_short);
if (mLockPatternUtils.isAutoPinConfirmFeatureAvailable()
if (LockPatternUtils.isAutoPinConfirmFeatureAvailable()
&& !mIsAlphaMode
&& error.requirement < MIN_AUTO_PIN_REQUIREMENT_LENGTH) {
Map<String, Object> arguments = new HashMap<>();
@@ -929,7 +929,7 @@ public class ChooseLockPassword extends SettingsActivity {
}
private void setAutoPinConfirmOption(boolean enabled, int length) {
if (!mLockPatternUtils.isAutoPinConfirmFeatureAvailable()
if (!LockPatternUtils.isAutoPinConfirmFeatureAvailable()
|| mAutoPinConfirmOption == null) {
return;
}

2
src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceController.java
View File

@@ -57,7 +57,7 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro
@Override
public boolean isAvailable() {
return mLockPatternUtils.isAutoPinConfirmFeatureAvailable() && isPinLock()
return LockPatternUtils.isAutoPinConfirmFeatureAvailable() && isPinLock()
&& isPinLengthEligibleForAutoConfirmation();
}