Merge "Stop calling LockPatternUtils#isAutoPinConfirmFeatureAvailable()" into main (62c3f00f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/password/ChooseLockPassword.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -962,9 +962,7 @@ public class ChooseLockPassword extends SettingsActivity {
		mIsAlphaMode
		? R.string.lockpassword_password_too_short
		: R.string.lockpassword_pin_too_short);
		if (LockPatternUtils.isAutoPinConfirmFeatureAvailable()
		&& !mIsAlphaMode
		&& error.requirement < MIN_AUTO_PIN_REQUIREMENT_LENGTH) {
		if (!mIsAlphaMode && error.requirement < MIN_AUTO_PIN_REQUIREMENT_LENGTH) {
		Map<String, Object> arguments = new HashMap<>();
		arguments.put("count", error.requirement);
		arguments.put("minAutoConfirmLen", MIN_AUTO_PIN_REQUIREMENT_LENGTH);
		@@ -1067,8 +1065,7 @@ public class ChooseLockPassword extends SettingsActivity {
		}

		private void setAutoPinConfirmOption(boolean enabled, int length) {
		if (!LockPatternUtils.isAutoPinConfirmFeatureAvailable()
		\|\| mAutoPinConfirmOption == null) {
		if (mAutoPinConfirmOption == null) {
		return;
		}
		if (enabled

+1 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,7 @@ public class AutoPinConfirmPreferenceController extends AbstractPreferenceContro

		@Override
		public boolean isAvailable() {
		return LockPatternUtils.isAutoPinConfirmFeatureAvailable() && isPinLock()
		&& isPinLengthEligibleForAutoConfirmation();
		return isPinLock() && isPinLengthEligibleForAutoConfirmation();
		}

		@Override