Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b47494ff authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

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

Merge "Add "Face" to not recognized message for face auth." into udc-d1-dev am: ac4f8fa8 am: 92ec539a am: d9563b7f

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



Change-Id: I14eae21fa129b3d40ee195b2dd537ad3c7fc2453
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48c7b232 d9563b7f

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1795,6 +1795,8 @@ 
    <string name="biometric_error_user_canceled">Authentication canceled</string>

    <!-- Message shown by the biometric dialog when biometric is not recognized -->

    <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] -->

    <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] -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2583,6 +2583,7 @@ 
  <java-symbol type="string" name="biometric_error_hw_unavailable" />

  <java-symbol type="string" name="biometric_error_user_canceled" />

  <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_device_not_secured" />

  <java-symbol type="string" name="biometric_error_generic" />

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+5 −1
Original line number Diff line number Diff line
@@ -1054,6 +1054,10 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
        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) {

        switch (modality) {
@@ -1100,7 +1104,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
                mCurrentDialog.animateToCredentialUI();

            } else if (isSoftError) {

                final String errorMessage = (error == BiometricConstants.BIOMETRIC_PAUSED_REJECTED)

                        ? mContext.getString(R.string.biometric_not_recognized)

                        ? getNotRecognizedString(modality)

                        : getErrorString(modality, error, vendorCode);

                if (DEBUG) Log.d(TAG, "onBiometricError, soft error: " + errorMessage);

                // The camera privacy error can return before the prompt initializes its state,