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

Commit 1d85542e authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Revert "On device lockdown, always show the keyguard"" into udc-qpr-dev am: 971b800c 

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



Change-Id: I341c664c8bf88efce95a5c1cccfe6653d3820d18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 709aca3d 971b800c

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −10
Original line number Diff line number Diff line
@@ -763,13 +763,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                }

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

            if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {

                doKeyguardLocked(null);

            }

        }

    };



    ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -2184,9 +2177,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     * Enable the keyguard if the settings are appropriate.

     */

    private void doKeyguardLocked(Bundle options) {

        // if another app is disabling us, don't show unless we're in lockdown mode

        if (!mExternallyEnabled

                && !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {

        // if another app is disabling us, don't show

        if (!mExternallyEnabled) {

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");



            mNeedToReshowWhenReenabled = true;

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+0 −25
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
    private @Mock AuthController mAuthController;

    private @Mock ShadeExpansionStateManager mShadeExpansionStateManager;

    private @Mock ShadeWindowLogger mShadeWindowLogger;

    private @Captor ArgumentCaptor<KeyguardUpdateMonitorCallback>

            mKeyguardUpdateMonitorCallbackCaptor;

    private @Captor ArgumentCaptor<KeyguardStateController.Callback>

            mKeyguardStateControllerCallback;

    private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake();
@@ -238,25 +236,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        KeyguardUpdateMonitor.setCurrentUser(mInitialUserId);

    }



    @Test

    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    public void onLockdown_showKeyguard_evenIfKeyguardIsNotEnabledExternally() {

        // GIVEN keyguard is not enabled and isn't showing

        mViewMediator.onSystemReady();

        mViewMediator.setKeyguardEnabled(false);

        TestableLooper.get(this).processAllMessages();

        captureKeyguardUpdateMonitorCallback();

        assertFalse(mViewMediator.isShowingAndNotOccluded());



        // WHEN lockdown occurs

        when(mLockPatternUtils.isUserInLockdown(anyInt())).thenReturn(true);

        mKeyguardUpdateMonitorCallbackCaptor.getValue().onStrongAuthStateChanged(0);



        // THEN keyguard is shown

        TestableLooper.get(this).processAllMessages();

        assertTrue(mViewMediator.isShowingAndNotOccluded());

    }



    @Test

    public void testOnGoingToSleep_UpdatesKeyguardGoingAway() {

        mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER);
@@ -1000,10 +979,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        mViewMediator.registerCentralSurfaces(mCentralSurfaces, null, null, null, null, null);

    }



    private void captureKeyguardUpdateMonitorCallback() {

        verify(mUpdateMonitor).registerCallback(mKeyguardUpdateMonitorCallbackCaptor.capture());

    }



    private void captureKeyguardStateControllerCallback() {

        verify(mKeyguardStateController).addCallback(mKeyguardStateControllerCallback.capture());

    }