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

Merge "Add "Face" to not recognized message for face auth." into udc-d1-dev

Browse Source
This commit is contained in:
Joe Bolinger
2023-06-05 16:46:03 +00:00
committed by Android (Google) Code Review
parent 843807e900 543ad9f9e5
commit ac4f8fa88f
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -1789,6 +1789,8 @@
<string name="biometric_error_user_canceled">Authentication canceled</string> <string name="biometric_error_user_canceled">Authentication canceled</string>
<!-- Message shown by the biometric dialog when biometric is not recognized --> <!-- Message shown by the biometric dialog when biometric is not recognized -->
<string name="biometric_not_recognized">Not recognized</string> <string name="biometric_not_recognized">Not recognized</string>
<!-- Message shown by the biometric dialog when face is not recognized [CHAR LIMIT=50] -->
<string name="biometric_face_not_recognized">Face not recognized</string>
<!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] --> <!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] -->
<string name="biometric_error_canceled">Authentication canceled</string> <string name="biometric_error_canceled">Authentication canceled</string>
<!-- Message returned to applications if BiometricPrompt setAllowDeviceCredentials is enabled but no pin, pattern, or password is set. [CHAR LIMIT=NONE] --> <!-- Message returned to applications if BiometricPrompt setAllowDeviceCredentials is enabled but no pin, pattern, or password is set. [CHAR LIMIT=NONE] -->

1
core/res/res/values/symbols.xml
View File

@@ -2571,6 +2571,7 @@
<java-symbol type="string" name="biometric_error_hw_unavailable" /> <java-symbol type="string" name="biometric_error_hw_unavailable" />
<java-symbol type="string" name="biometric_error_user_canceled" /> <java-symbol type="string" name="biometric_error_user_canceled" />
<java-symbol type="string" name="biometric_not_recognized" /> <java-symbol type="string" name="biometric_not_recognized" />
<java-symbol type="string" name="biometric_face_not_recognized" />
<java-symbol type="string" name="biometric_error_canceled" /> <java-symbol type="string" name="biometric_error_canceled" />
<java-symbol type="string" name="biometric_error_device_not_secured" /> <java-symbol type="string" name="biometric_error_device_not_secured" />
<java-symbol type="string" name="biometric_error_generic" /> <java-symbol type="string" name="biometric_error_generic" />

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

@@ -1048,6 +1048,10 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
return false; return false;
} }
private String getNotRecognizedString(@Modality int modality) {
return mContext.getString(modality == TYPE_FACE
? R.string.biometric_face_not_recognized : R.string.biometric_not_recognized);
}
private String getErrorString(@Modality int modality, int error, int vendorCode) { private String getErrorString(@Modality int modality, int error, int vendorCode) {
switch (modality) { switch (modality) {
@@ -1094,7 +1098,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
mCurrentDialog.animateToCredentialUI(); mCurrentDialog.animateToCredentialUI();
} else if (isSoftError) { } else if (isSoftError) {
final String errorMessage = (error == BiometricConstants.BIOMETRIC_PAUSED_REJECTED) final String errorMessage = (error == BiometricConstants.BIOMETRIC_PAUSED_REJECTED)
? mContext.getString(R.string.biometric_not_recognized) ? getNotRecognizedString(modality)
: getErrorString(modality, error, vendorCode); : getErrorString(modality, error, vendorCode);
if (DEBUG) Log.d(TAG, "onBiometricError, soft error: " + errorMessage); if (DEBUG) Log.d(TAG, "onBiometricError, soft error: " + errorMessage);
// The camera privacy error can return before the prompt initializes its state, // The camera privacy error can return before the prompt initializes its state,