Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SysUI filters fingerprint errors from keyguard" into tm-qpr-dev am: 295626d065

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19954051

Change-Id: I8be2977884841cf4fa7fae4bd98fee96115ca920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2022-09-23 22:29:16 +00:00
committed by Automerger Merge Worker
parent 6f165ebe08 295626d065
commit a46dc1923c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -1199,7 +1199,8 @@ public class KeyguardIndicationController {
return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */) return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)
&& msgId != FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) && msgId != FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT)
|| msgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED || 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) { private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

13
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java
View File

@@ -634,6 +634,19 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
verifyNoMessage(INDICATION_TYPE_TRANSIENT); 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 @Test
public void transientIndication_swipeUpToRetry() { public void transientIndication_swipeUpToRetry() {
createController(); createController();