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

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

[DO NOT MERGE] Update BP "Not recognized" message with UX/UI spec am: a39a975e 

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



Change-Id: I58d4a8b41db44680bc2b45a31872e7f108e27ea1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34873cbe a39a975e

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

+10 −2
Original line number Diff line number Diff line
@@ -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) {

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

+4 −0
Original line number Diff line number Diff line
@@ -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);