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

Commit 242f0f53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove co-ex logic for blocking face help msgs" into tm-dev am: a9b6e8c3 am: 2bc621b8 

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



Change-Id: I9768f48aa78f6dbae22381c9b4654ccb028217ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9dccea1 2bc621b8

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+0 −19
Original line number Original line Diff line number Diff line
@@ -987,11 +987,6 @@ public class KeyguardIndicationController { 
                mStatusBarKeyguardViewManager.showBouncerMessage(helpString,

                mStatusBarKeyguardViewManager.showBouncerMessage(helpString,

                        mInitialTextColorState);

                        mInitialTextColorState);

            } else if (mScreenLifecycle.getScreenState() == SCREEN_ON) {

            } else if (mScreenLifecycle.getScreenState() == SCREEN_ON) {

                if (biometricSourceType == BiometricSourceType.FACE

                        && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {

                    showFaceFailedTryFingerprintMsg(msgId, helpString);

                    return;

                }

                showBiometricMessage(helpString);

                showBiometricMessage(helpString);

            } else if (showActionToUnlock) {

            } else if (showActionToUnlock) {

                mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_ACTION_TO_UNLOCK),

                mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_ACTION_TO_UNLOCK),
@@ -1005,13 +1000,6 @@ public class KeyguardIndicationController { 
            if (shouldSuppressBiometricError(msgId, biometricSourceType, mKeyguardUpdateMonitor)) {

            if (shouldSuppressBiometricError(msgId, biometricSourceType, mKeyguardUpdateMonitor)) {

                return;

                return;

            }

            }

            if (biometricSourceType == BiometricSourceType.FACE

                    && shouldSuppressFaceMsgAndShowTryFingerprintMsg()

                    && !mStatusBarKeyguardViewManager.isBouncerShowing()

                    && mScreenLifecycle.getScreenState() == SCREEN_ON) {

                showFaceFailedTryFingerprintMsg(msgId, errString);

                return;

            }

            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {

            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {

                // The face timeout message is not very actionable, let's ask the user to

                // The face timeout message is not very actionable, let's ask the user to

                // manually retry.

                // manually retry.
@@ -1058,13 +1046,6 @@ public class KeyguardIndicationController { 
                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED);

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED);

        }

        }





        private boolean shouldSuppressFaceMsgAndShowTryFingerprintMsg() {

            // For dual biometric, don't show face auth messages

            return mKeyguardUpdateMonitor.isFingerprintDetectionRunning()

                    && mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(

                            true /* isStrongBiometric */);

        }



        private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

        private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

            // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

            // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

            // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to

            // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+0 −27
Original line number Original line Diff line number Diff line
@@ -751,33 +751,6 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        verifyTransientMessage(message);

        verifyTransientMessage(message);

    }

    }





    @Test

    public void faceAuthMessageSuppressed() {

        createController();

        String faceHelpMsg = "Face auth help message";



        // GIVEN state of showing message when keyguard screen is on

        when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true);

        when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false);



        // GIVEN fingerprint is also running (not udfps)

        when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);

        when(mKeyguardUpdateMonitor.isUdfpsSupported()).thenReturn(false);



        mController.setVisible(true);



        // WHEN a face help message comes in

        mController.getKeyguardCallback().onBiometricHelp(

                KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED, faceHelpMsg,

                BiometricSourceType.FACE);



        // THEN no help message appears

        verify(mRotateTextViewController, never()).showTransient(anyString());



        // THEN the face help message is still announced for a11y

        verify(mIndicationAreaBottom).announceForAccessibility(eq(faceHelpMsg));

    }



    @Test

    @Test

    public void testEmptyOwnerInfoHidesIndicationArea() {

    public void testEmptyOwnerInfoHidesIndicationArea() {

        createController();

        createController();