Merge "SysUI filters fingerprint errors from keyguard" into tm-qpr-dev (295626d0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1199,7 +1199,8 @@ public class KeyguardIndicationController {
		return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)
		&& msgId != FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT)
		\|\| msgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED
		\|\| msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED);
		\|\| msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED
		\|\| msgId == FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED);
		}

		private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

+13 −0

Original line number	Diff line number	Diff line
		@@ -634,6 +634,19 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
		verifyNoMessage(INDICATION_TYPE_TRANSIENT);
		}

		@Test
		public void transientIndication_visibleWhenDozing_ignoresPowerPressed() {
		createController();

		mController.setVisible(true);
		reset(mRotateTextViewController);
		mController.getKeyguardCallback().onBiometricError(
		FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED, "foo",
		BiometricSourceType.FINGERPRINT);

		verifyNoMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE);
		}

		@Test
		public void transientIndication_swipeUpToRetry() {
		createController();