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

Merge "Update co-ex face failure message" into tm-qpr-dev am: c8f7faf7f9

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

Change-Id: Ie64455c427657ae0d1005541fd05b896217d514f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-01 03:05:55 +00:00
committed by Automerger Merge Worker
parent bb34760a37 c8f7faf7f9
commit 8a2ab14d80
4 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res-keyguard/values/strings.xml
View File

@@ -217,7 +217,7 @@
the force lock button. [CHAR LIMIT=80] --> the force lock button. [CHAR LIMIT=80] -->
<string name="kg_prompt_reason_user_request">Device was locked manually</string> <string name="kg_prompt_reason_user_request">Device was locked manually</string>
<!-- Face hint message when finger was not recognized. [CHAR LIMIT=20] --> <!-- Face hint message when face was not recognized. [CHAR LIMIT=20] -->
<string name="kg_face_not_recognized">Not recognized</string> <string name="kg_face_not_recognized">Not recognized</string>
<!-- Error message indicating that the camera privacy sensor has been turned on [CHAR LIMIT=53] --> <!-- Error message indicating that the camera privacy sensor has been turned on [CHAR LIMIT=53] -->

4
packages/SystemUI/res/values/strings.xml
View File

@@ -389,6 +389,10 @@
<string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string> <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string>
<!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] --> <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->
<string name="keyguard_face_failed_use_fp">@string/fingerprint_dialog_use_fingerprint_instead</string> <string name="keyguard_face_failed_use_fp">@string/fingerprint_dialog_use_fingerprint_instead</string>
<!-- Message shown to inform the user a face cannot be recognized. [CHAR LIMIT=25] -->
<string name="keyguard_face_failed">Can\u2019t recognize face</string>
<!-- Message shown to suggest using fingerprint sensor to authenticate after another biometric failed. [CHAR LIMIT=25] -->
<string name="keyguard_suggest_fingerprint">Use fingerprint instead</string>
<!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_bluetooth_connected">Bluetooth connected.</string> <string name="accessibility_bluetooth_connected">Bluetooth connected.</string>

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

@@ -19,9 +19,12 @@ package com.android.systemui.statusbar;
import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED; import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE; import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE;
import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE; import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE;
import static android.hardware.biometrics.BiometricSourceType.FACE;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED;
import static com.android.keyguard.KeyguardUpdateMonitor.getCurrentUser;
import static com.android.systemui.DejankUtils.whitelistIpcs; import static com.android.systemui.DejankUtils.whitelistIpcs;
import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.IMPORTANT_MSG_MIN_DURATION; import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.IMPORTANT_MSG_MIN_DURATION;
import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_ALIGNMENT; import static com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController.INDICATION_TYPE_ALIGNMENT;
@@ -428,9 +431,9 @@ public class KeyguardIndicationController {
if (info == null) { if (info == null) {
// Use the current user owner information if enabled. // Use the current user owner information if enabled.
final boolean ownerInfoEnabled = mLockPatternUtils.isOwnerInfoEnabled( final boolean ownerInfoEnabled = mLockPatternUtils.isOwnerInfoEnabled(
KeyguardUpdateMonitor.getCurrentUser()); getCurrentUser());
if (ownerInfoEnabled) { if (ownerInfoEnabled) {
info = mLockPatternUtils.getOwnerInfo(KeyguardUpdateMonitor.getCurrentUser()); info = mLockPatternUtils.getOwnerInfo(getCurrentUser());
} }
} }
@@ -595,7 +598,7 @@ public class KeyguardIndicationController {
private void updateLockScreenLogoutView() { private void updateLockScreenLogoutView() {
final boolean shouldShowLogout = mKeyguardUpdateMonitor.isLogoutEnabled() final boolean shouldShowLogout = mKeyguardUpdateMonitor.isLogoutEnabled()
&& KeyguardUpdateMonitor.getCurrentUser() != UserHandle.USER_SYSTEM; && getCurrentUser() != UserHandle.USER_SYSTEM;
if (shouldShowLogout) { if (shouldShowLogout) {
mRotateTextViewController.updateIndication( mRotateTextViewController.updateIndication(
INDICATION_TYPE_LOGOUT, INDICATION_TYPE_LOGOUT,
@@ -610,7 +613,7 @@ public class KeyguardIndicationController {
if (mFalsingManager.isFalseTap(LOW_PENALTY)) { if (mFalsingManager.isFalseTap(LOW_PENALTY)) {
return; return;
} }
int currentUserId = KeyguardUpdateMonitor.getCurrentUser(); int currentUserId = getCurrentUser();
mDevicePolicyManager.logoutUser(); mDevicePolicyManager.logoutUser();
}) })
.build(), .build(),
@@ -767,7 +770,7 @@ public class KeyguardIndicationController {
mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE); mHandler.removeMessages(MSG_HIDE_BIOMETRIC_MESSAGE);
hideBiometricMessageDelayed( hideBiometricMessageDelayed(
mBiometricMessageFollowUp != null mBiometricMessageFollowUp != null
? DEFAULT_HIDE_DELAY_MS * 2 ? IMPORTANT_MSG_MIN_DURATION * 2
: DEFAULT_HIDE_DELAY_MS : DEFAULT_HIDE_DELAY_MS
); );
@@ -847,7 +850,7 @@ public class KeyguardIndicationController {
mTopIndicationView.setVisibility(GONE); mTopIndicationView.setVisibility(GONE);
mTopIndicationView.setText(null); mTopIndicationView.setText(null);
mLockScreenIndicationView.setVisibility(View.VISIBLE); mLockScreenIndicationView.setVisibility(View.VISIBLE);
updateLockScreenIndications(animate, KeyguardUpdateMonitor.getCurrentUser()); updateLockScreenIndications(animate, getCurrentUser());
} }
protected String computePowerIndication() { protected String computePowerIndication() {
@@ -915,7 +918,7 @@ public class KeyguardIndicationController {
public void showActionToUnlock() { public void showActionToUnlock() {
if (mDozing if (mDozing
&& !mKeyguardUpdateMonitor.getUserCanSkipBouncer( && !mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) { getCurrentUser())) {
return; return;
} }
@@ -928,7 +931,7 @@ public class KeyguardIndicationController {
} }
} else { } else {
final boolean canSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer( final boolean canSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser()); getCurrentUser());
if (canSkipBouncer) { if (canSkipBouncer) {
final boolean faceAuthenticated = mKeyguardUpdateMonitor.getIsFaceAuthenticated(); final boolean faceAuthenticated = mKeyguardUpdateMonitor.getIsFaceAuthenticated();
final boolean udfpsSupported = mKeyguardUpdateMonitor.isUdfpsSupported(); final boolean udfpsSupported = mKeyguardUpdateMonitor.isUdfpsSupported();
@@ -1045,12 +1048,15 @@ public class KeyguardIndicationController {
return; return;
} }
boolean showActionToUnlock = final boolean faceAuthSoftError = biometricSourceType == FACE
msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED; && msgId != BIOMETRIC_HELP_FACE_NOT_RECOGNIZED;
if (biometricSourceType == BiometricSourceType.FACE final boolean faceAuthFailed = biometricSourceType == FACE
&& !showActionToUnlock && msgId == BIOMETRIC_HELP_FACE_NOT_RECOGNIZED; // ran through matcher & failed
&& mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible( final boolean isUnlockWithFingerprintPossible =
KeyguardUpdateMonitor.getCurrentUser()) mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
getCurrentUser());
if (faceAuthSoftError
&& isUnlockWithFingerprintPossible
&& !mCoExFaceHelpMsgIdsToShow.contains(msgId)) { && !mCoExFaceHelpMsgIdsToShow.contains(msgId)) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "skip showing msgId=" + msgId + " helpString=" + helpString Log.d(TAG, "skip showing msgId=" + msgId + " helpString=" + helpString
@@ -1061,8 +1067,16 @@ public class KeyguardIndicationController {
mStatusBarKeyguardViewManager.showBouncerMessage(helpString, mStatusBarKeyguardViewManager.showBouncerMessage(helpString,
mInitialTextColorState); mInitialTextColorState);
} else if (mScreenLifecycle.getScreenState() == SCREEN_ON) { } else if (mScreenLifecycle.getScreenState() == SCREEN_ON) {
showBiometricMessage(helpString); if (faceAuthFailed && isUnlockWithFingerprintPossible) {
} else if (showActionToUnlock) { showBiometricMessage(
mContext.getString(R.string.keyguard_face_failed),
mContext.getString(R.string.keyguard_suggest_fingerprint)
);
} else {
showBiometricMessage(helpString);
}
} else if (faceAuthFailed) {
// show action to unlock
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_ACTION_TO_UNLOCK), mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_ACTION_TO_UNLOCK),
TRANSIENT_BIOMETRIC_ERROR_TIMEOUT); TRANSIENT_BIOMETRIC_ERROR_TIMEOUT);
} else { } else {
@@ -1080,17 +1094,17 @@ public class KeyguardIndicationController {
return; return;
} }
if (biometricSourceType == BiometricSourceType.FACE if (biometricSourceType == FACE
&& msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS) { && msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS) {
// suppress all face UNABLE_TO_PROCESS errors // suppress all face UNABLE_TO_PROCESS errors
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "skip showing FACE_ERROR_UNABLE_TO_PROCESS errString=" Log.d(TAG, "skip showing FACE_ERROR_UNABLE_TO_PROCESS errString="
+ errString); + errString);
} }
} else if (biometricSourceType == BiometricSourceType.FACE } else if (biometricSourceType == FACE
&& msgId == FaceManager.FACE_ERROR_TIMEOUT) { && msgId == FaceManager.FACE_ERROR_TIMEOUT) {
if (mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible( if (mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
KeyguardUpdateMonitor.getCurrentUser())) { getCurrentUser())) {
// no message if fingerprint is also enrolled // no message if fingerprint is also enrolled
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "skip showing FACE_ERROR_TIMEOUT due to co-ex logic"); Log.d(TAG, "skip showing FACE_ERROR_TIMEOUT due to co-ex logic");
@@ -1122,8 +1136,9 @@ public class KeyguardIndicationController {
BiometricSourceType biometricSourceType, KeyguardUpdateMonitor updateMonitor) { BiometricSourceType biometricSourceType, KeyguardUpdateMonitor updateMonitor) {
if (biometricSourceType == BiometricSourceType.FINGERPRINT) if (biometricSourceType == BiometricSourceType.FINGERPRINT)
return shouldSuppressFingerprintError(msgId, updateMonitor); return shouldSuppressFingerprintError(msgId, updateMonitor);
if (biometricSourceType == BiometricSourceType.FACE) if (biometricSourceType == FACE) {
return shouldSuppressFaceError(msgId, updateMonitor); return shouldSuppressFaceError(msgId, updateMonitor);
}
return false; return false;
} }
@@ -1152,7 +1167,7 @@ public class KeyguardIndicationController {
@Override @Override
public void onTrustChanged(int userId) { public void onTrustChanged(int userId) {
if (KeyguardUpdateMonitor.getCurrentUser() != userId) { if (getCurrentUser() != userId) {
return; return;
} }
updateDeviceEntryIndication(false); updateDeviceEntryIndication(false);
@@ -1172,7 +1187,7 @@ public class KeyguardIndicationController {
@Override @Override
public void onBiometricRunningStateChanged(boolean running, public void onBiometricRunningStateChanged(boolean running,
BiometricSourceType biometricSourceType) { BiometricSourceType biometricSourceType) {
if (running && biometricSourceType == BiometricSourceType.FACE) { if (running && biometricSourceType == FACE) {
// Let's hide any previous messages when authentication starts, otherwise // Let's hide any previous messages when authentication starts, otherwise
// multiple auth attempts would overlap. // multiple auth attempts would overlap.
hideBiometricMessage(); hideBiometricMessage();
@@ -1186,7 +1201,7 @@ public class KeyguardIndicationController {
super.onBiometricAuthenticated(userId, biometricSourceType, isStrongBiometric); super.onBiometricAuthenticated(userId, biometricSourceType, isStrongBiometric);
hideBiometricMessage(); hideBiometricMessage();
if (biometricSourceType == BiometricSourceType.FACE if (biometricSourceType == FACE
&& !mKeyguardBypassController.canBypass()) { && !mKeyguardBypassController.canBypass()) {
showActionToUnlock(); showActionToUnlock();
} }

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

@@ -569,6 +569,33 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, message); verifyIndicationMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE, message);
} }
@Test
public void onBiometricHelp_coEx_faceFailure() {
createController();
// GIVEN unlocking with fingerprint is possible
when(mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(anyInt()))
.thenReturn(true);
String message = "A message";
mController.setVisible(true);
// WHEN there's a face not recognized message
mController.getKeyguardCallback().onBiometricHelp(
KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED,
message,
BiometricSourceType.FACE);
// THEN show sequential messages such as: 'face not recognized' and
// 'try fingerprint instead'
verifyIndicationMessage(
INDICATION_TYPE_BIOMETRIC_MESSAGE,
mContext.getString(R.string.keyguard_face_failed));
verifyIndicationMessage(
INDICATION_TYPE_BIOMETRIC_MESSAGE_FOLLOW_UP,
mContext.getString(R.string.keyguard_suggest_fingerprint));
}
@Test @Test
public void transientIndication_visibleWhenDozing_unlessSwipeUp_fromError() { public void transientIndication_visibleWhenDozing_unlessSwipeUp_fromError() {
createController(); createController();