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

Merge "[DO NOT MERGE] Update BP "Not recognized" message with UX/UI spec" into udc-d1-dev

Browse Source
This commit is contained in:
Wenhui Yang
2023-06-19 08:42:58 +00:00
committed by Android (Google) Code Review
parent d6061dae0c a39a975e7b
commit a2f387efb4
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -1049,8 +1049,16 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
}
private String getNotRecognizedString(@Modality int modality) {
return mContext.getString(modality == TYPE_FACE
? R.string.biometric_face_not_recognized : R.string.biometric_not_recognized);
final int messageRes;
final int userId = mCurrentDialogArgs.argi1;
if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) {
messageRes = modality == TYPE_FACE
? R.string.biometric_face_not_recognized
: R.string.fingerprint_error_not_match;
} else {
messageRes = R.string.biometric_not_recognized;
}
return mContext.getString(messageRes);
}
private String getErrorString(@Modality int modality, int error, int vendorCode) {

4
services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java
View File

@@ -182,6 +182,10 @@ public class BiometricServiceTest {
.thenReturn(ERROR_HW_UNAVAILABLE);
when(mResources.getString(R.string.biometric_not_recognized))
.thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.biometric_face_not_recognized))
.thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.fingerprint_error_not_match))
.thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.biometric_error_user_canceled))
.thenReturn(ERROR_USER_CANCELED);