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

Don't show 'try fingerprint' msg on face auth help

Browse Source 
Sometimes multiple biometric-help suggestions for face auth
can be sent right before a face auth sucesss. If udfps
is suppressing the face auth help message, don't show any messages
(previouosly we'd show "try fingerprint" which was unhelpful
and sometimes was shown on screen as a successful face auth
was occurring which was confusing).

Note: we will continue to announce the help
messages for a11y purposes.

Test: atest KeyguardIndicationControllerTest
Test: manually auth with face, see keyguard message
Fixes: 203897784
Change-Id: I75b9e19b812505ff2dafa960600da67135448042
This commit is contained in:
Beverly
2021-11-12 10:32:53 -05:00
parent 3abdb0179e
commit 79079e8a33
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -912,7 +912,11 @@ public class KeyguardIndicationController {
} else if (mKeyguardUpdateMonitor.isScreenOn()) {
if (biometricSourceType == BiometricSourceType.FACE
&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {
showTryFingerprintMsg(msgId, helpString);
// don't show any help messages, b/c they can come in right before a success
// However, continue to announce help messages for a11y
if (!TextUtils.isEmpty(helpString)) {
mLockScreenIndicationView.announceForAccessibility(helpString);
}
return;
}
showTransientIndication(helpString, false /* isError */, showActionToUnlock);

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

@@ -710,8 +710,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED, faceHelpMsg,
BiometricSourceType.FACE);
// THEN "try fingerprint" message appears (and not the face help message)
verifyTransientMessage(mKeyguardTryFingerprintMsg);
// THEN no help message appears
verify(mRotateTextViewController, never()).showTransient(anyString());
// THEN the face help message is still announced for a11y
verify(mIndicationAreaBottom).announceForAccessibility(eq(faceHelpMsg));