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

Commit d969b762 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Only delay bouncer if bypass is off 

Test: pull up bouncer with bypass on and off
Test: atest KeyguardBouncerTest
Fixes: 137563419
Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
parent 0a1103ee

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+3 −2
Original line number Diff line number Diff line
@@ -114,11 +114,12 @@ public class SystemUIFactory { 
            LockPatternUtils lockPatternUtils, ViewGroup container,

            DismissCallbackRegistry dismissCallbackRegistry,

            KeyguardBouncer.BouncerExpansionCallback expansionCallback,

            FalsingManager falsingManager) {

            FalsingManager falsingManager, KeyguardBypassController bypassController) {

        return new KeyguardBouncer(context, callback, lockPatternUtils, container,

                dismissCallbackRegistry, falsingManager,

                expansionCallback, UnlockMethodCache.getInstance(context),

                KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper()));

                KeyguardUpdateMonitor.getInstance(context), bypassController,

                new Handler(Looper.getMainLooper()));

    }



    public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+6 −2
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class KeyguardBouncer { 
                }

            };

    private final Runnable mRemoveViewRunnable = this::removeView;

    private final KeyguardBypassController mKeyguardBypassController;

    protected KeyguardHostView mKeyguardView;

    private final Runnable mResetRunnable = ()-> {

        if (mKeyguardView != null) {
@@ -97,7 +98,8 @@ public class KeyguardBouncer { 
            LockPatternUtils lockPatternUtils, ViewGroup container,

            DismissCallbackRegistry dismissCallbackRegistry, FalsingManager falsingManager,

            BouncerExpansionCallback expansionCallback, UnlockMethodCache unlockMethodCache,

            KeyguardUpdateMonitor keyguardUpdateMonitor, Handler handler) {

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardBypassController keyguardBypassController, Handler handler) {

        mContext = context;

        mCallback = callback;

        mLockPatternUtils = lockPatternUtils;
@@ -109,6 +111,7 @@ public class KeyguardBouncer { 
        mHandler = handler;

        mUnlockMethodCache = unlockMethodCache;

        mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback);

        mKeyguardBypassController = keyguardBypassController;

    }



    public void show(boolean resetSecuritySelection) {
@@ -171,7 +174,8 @@ public class KeyguardBouncer { 
        // Split up the work over multiple frames.

        DejankUtils.removeCallbacks(mResetRunnable);

        if (mUnlockMethodCache.isFaceAuthEnabled() && !needsFullscreenBouncer()

                && !mKeyguardUpdateMonitor.userNeedsStrongAuth()) {

                && !mKeyguardUpdateMonitor.userNeedsStrongAuth()

                && !mKeyguardBypassController.getBypassEnabled()) {

            mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY);

        } else {

            DejankUtils.postAfterTraversal(mShowRunnable);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mBiometricUnlockController = biometricUnlockController;

        mBouncer = SystemUIFactory.getInstance().createKeyguardBouncer(mContext,

                mViewMediatorCallback, mLockPatternUtils, container, dismissCallbackRegistry,

                mExpansionCallback, falsingManager);

                mExpansionCallback, falsingManager, bypassController);

        mNotificationPanelView = notificationPanelView;

        notificationPanelView.addExpansionListener(this);

        mBypassController = bypassController;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java

+14 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;
@@ -84,6 +85,8 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
    @Mock

    private UnlockMethodCache mUnlockMethodCache;

    @Mock

    private KeyguardBypassController mKeyguardBypassController;

    @Mock

    private Handler mHandler;



    private KeyguardBouncer mBouncer;
@@ -98,7 +101,8 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        when(mKeyguardHostView.getHeight()).thenReturn(500);

        mBouncer = new KeyguardBouncer(getContext(), mViewMediatorCallback,

                mLockPatternUtils, container, mDismissCallbackRegistry, mFalsingManager,

                mExpansionCallback, mUnlockMethodCache, mKeyguardUpdateMonitor, mHandler) {

                mExpansionCallback, mUnlockMethodCache, mKeyguardUpdateMonitor,

                mKeyguardBypassController, mHandler) {

            @Override

            protected void inflateView() {

                super.inflateView();
@@ -390,6 +394,15 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        verify(mHandler).removeCallbacks(eq(showRunnable.getValue()));

    }



    @Test

    public void testShow_delaysIfFaceAuthIsRunning_unlessBypass() {

        when(mUnlockMethodCache.isFaceAuthEnabled()).thenReturn(true);

        when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);

        mBouncer.show(true /* reset */);



        verify(mHandler, never()).postDelayed(any(), anyLong());

    }



    @Test

    public void testRegisterUpdateMonitorCallback() {

        verify(mKeyguardUpdateMonitor).registerCallback(any());