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

Commit fc8aec7c authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "Display display "Fingerprint not recognized" on BP" into udc-qpr-dev... 

Merge "Display display "Fingerprint not recognized" on BP" into udc-qpr-dev am: f5454e37 am: 4a3fa4e4

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



Change-Id: I8c9e6871cb41f8b7223e783c4c593e521a465dee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f25d493 4a3fa4e4

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1793,8 +1793,6 @@ 
    <string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string>

    <!-- Message shown when biometric authentication was canceled by the user [CHAR LIMIT=50] -->

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ 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);

                ? R.string.biometric_face_not_recognized : R.string.fingerprint_error_not_match);

    }



    private String getErrorString(@Modality int modality, int error, int vendorCode) {

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ public class AuthControllerTest extends SysuiTestCase { 


        assertEquals(modalityCaptor.getValue().intValue(), modality);

        assertEquals(messageCaptor.getValue(),

                mContext.getString(R.string.biometric_not_recognized));

                mContext.getString(R.string.fingerprint_error_not_match));

    }



    @Test

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

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class BiometricServiceTest { 


        when(mResources.getString(R.string.biometric_error_hw_unavailable))

                .thenReturn(ERROR_HW_UNAVAILABLE);

        when(mResources.getString(R.string.biometric_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);