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

Commit 59178368 authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Revert "Stop face auth when bouncerWillBeShown instead of... 

Merge "Revert "Stop face auth when bouncerWillBeShown instead of bouncerFullyShown"" into tm-qpr-dev
parents dbf61511 8477876b

packages/SystemUI/src/com/android/keyguard/KeyguardListenModel.kt

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ data class KeyguardFaceListenModel( 
    val becauseCannotSkipBouncer: Boolean,

    val biometricSettingEnabledForUser: Boolean,

    val bouncerFullyShown: Boolean,

    val bouncerIsOrWillShow: Boolean,

    val faceAuthenticated: Boolean,

    val faceDisabled: Boolean,

    val faceLockedOut: Boolean,

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −4
Original line number Diff line number Diff line
@@ -2597,7 +2597,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // on bouncer if both fp and fingerprint are enrolled.

        final boolean awakeKeyguardExcludingBouncerShowing = mKeyguardIsVisible

                && mDeviceInteractive && !mGoingToSleep

                && !statusBarShadeLocked && !mBouncerIsOrWillBeShowing;

                && !statusBarShadeLocked && !mBouncerFullyShown;

        final int user = getCurrentUser();

        final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user);

        final boolean isLockDown =
@@ -2667,7 +2667,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    becauseCannotSkipBouncer,

                    biometricEnabledForUser,

                    mBouncerFullyShown,

                    mBouncerIsOrWillBeShowing,

                    faceAuthenticated,

                    faceDisabledForUser,

                    isFaceLockedOut(),
@@ -3243,8 +3242,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    cb.onKeyguardBouncerStateChanged(mBouncerIsOrWillBeShowing);

                }

            }

            updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE,

                    FaceAuthUiEvent.FACE_AUTH_UPDATED_PRIMARY_BOUNCER_SHOWN_OR_WILL_BE_SHOWN);

            updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

        }



        if (wasBouncerFullyShown != mBouncerFullyShown) {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardListenQueueTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ private fun faceModel(user: Int) = KeyguardFaceListenModel( 
    becauseCannotSkipBouncer = false,

    biometricSettingEnabledForUser = false,

    bouncerFullyShown = false,

    bouncerIsOrWillShow = false,

    onlyFaceEnrolled = false,

    faceAuthenticated = false,

    faceDisabled = false,

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −6
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                anyBoolean());

        CancellationSignal cancelSignal = mCancellationSignalCaptor.getValue();



        bouncerWillBeVisibleSoon();

        bouncerFullyVisible();

        mTestableLooper.processAllMessages();



        assertThat(cancelSignal.isCanceled()).isTrue();
@@ -1752,11 +1752,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        setKeyguardBouncerVisibility(true);

    }



    private void bouncerWillBeVisibleSoon() {

        mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true, false);

        mTestableLooper.processAllMessages();

    }



    private void setKeyguardBouncerVisibility(boolean isVisible) {

        mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(isVisible, isVisible);

        mTestableLooper.processAllMessages();