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

Commit 7c34e2fb authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "SysUI filters fingerprint errors from keyguard" into tm-qpr-dev am:... 

Merge "SysUI filters fingerprint errors from keyguard" into tm-qpr-dev am: 295626d0 am: a46dc192

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



Change-Id: I227a53a4ef9bce91df3b301da37663de8c58d285
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 414479d3 a46dc192

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

+2 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,8 @@ public class KeyguardIndicationController { 
            return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)

                    && msgId != FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT)

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED);

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED

                    || msgId == FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED);

        }



        private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

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

+13 −0
Original line number Diff line number Diff line
@@ -634,6 +634,19 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        verifyNoMessage(INDICATION_TYPE_TRANSIENT);

    }



    @Test

    public void transientIndication_visibleWhenDozing_ignoresPowerPressed() {

        createController();



        mController.setVisible(true);

        reset(mRotateTextViewController);

        mController.getKeyguardCallback().onBiometricError(

                FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED, "foo",

                BiometricSourceType.FINGERPRINT);



        verifyNoMessage(INDICATION_TYPE_BIOMETRIC_MESSAGE);

    }



    @Test

    public void transientIndication_swipeUpToRetry() {

        createController();