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

Commit 543ad9f9 authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Add "Face" to not recognized message for face auth. 

Bug: 272510026
Test: manual (use BP test app with coex, fail face and fingerprint auth and check not recognized message)
Change-Id: I22452b3476dbabe8cfe28500bc41ed209bbafa9f
parent 94b1c806

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,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
@@ -2571,6 +2571,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
@@ -1048,6 +1048,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) {
@@ -1094,7 +1098,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,