Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev (b79e0168) · Commits · e / os / android_packages_apps_Settings

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,13 @@ public class BiometricFragment extends InstrumentedFragment {
		});
		cleanup();
		}

		@Override
		public void onAuthenticationFailed() {
		mClientExecutor.execute(() -> {
		mClientCallback.onAuthenticationFailed();
		});
		}
		};

		private final DialogInterface.OnClickListener mNegativeButtonListener =

+10 −2

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
		});

		private AuthenticationCallback mAuthenticationCallback = new AuthenticationCallback() {
		@Override
		public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
		if (!mGoingToBackground) {
		if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED
		@@ -123,17 +124,24 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
		}
		}

		@Override
		public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) {
		mTrustManager.setDeviceLockedForUser(mUserId, false);

		final boolean isStrongAuth = result.getAuthenticationType()
		== BiometricPrompt.AUTHENTICATION_RESULT_TYPE_DEVICE_CREDENTIAL;
		ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils, mUserManager,
		mUserId);
		mDevicePolicyManager, mUserId, isStrongAuth);
		ConfirmDeviceCredentialUtils.checkForPendingIntent(
		ConfirmDeviceCredentialActivity.this);

		setResult(Activity.RESULT_OK);
		finish();
		}

		@Override
		public void onAuthenticationFailed() {
		mDevicePolicyManager.reportFailedBiometricAttempt(mUserId);
		}
		};

		private String getStringForError(int errorCode) {

+7 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.ActivityOptions;
		import android.app.IActivityManager;
		import android.app.admin.DevicePolicyManager;
		import android.content.Intent;
		import android.content.IntentSender;
		import android.os.RemoteException;
		@@ -54,8 +55,12 @@ public class ConfirmDeviceCredentialUtils {
		}

		public static void reportSuccessfulAttempt(LockPatternUtils utils, UserManager userManager,
		int userId) {
		DevicePolicyManager dpm, int userId, boolean isStrongAuth) {
		if (isStrongAuth) {
		utils.reportSuccessfulPasswordAttempt(userId);
		} else {
		dpm.reportSuccessfulBiometricAttempt(userId);
		}
		if (userManager.isManagedProfile(userId)) {
		// Keyguard is responsible to disable StrongAuth for primary user. Disable StrongAuth
		// for work challenge only here.

+2 −1

Original line number	Diff line number	Diff line
		@@ -475,7 +475,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
		if (matched) {
		if (newResult) {
		ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils,
		mUserManager, mEffectiveUserId);
		mUserManager, mDevicePolicyManager, mEffectiveUserId,
		/* isStrongAuth */ true);
		}
		startDisappearAnimation(intent);
		ConfirmDeviceCredentialUtils.checkForPendingIntent(getActivity());

+2 −1

Original line number	Diff line number	Diff line
		@@ -509,7 +509,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
		if (matched) {
		if (newResult) {
		ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils,
		mUserManager, mEffectiveUserId);
		mUserManager, mDevicePolicyManager, mEffectiveUserId,
		/* isStrongAuth */ true);
		}
		startDisappearAnimation(intent);
		ConfirmDeviceCredentialUtils.checkForPendingIntent(getActivity());