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

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

Merge "Updated: always show the keyguard on device lockdown" into udc-qpr-dev am: db9f9d76 

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



Change-Id: I7e08f15c1992bc8298446d6e79562b71f4a94db9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8690289f db9f9d76

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

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

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }

    };



    ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1957,6 +1964,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
            mExternallyEnabled = enabled;



            if (!enabled && mShowing) {

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

                    Log.d(TAG, "keyguardEnabled(false) overridden by user lockdown");

                    return;

                }

                // hiding keyguard that is showing, remember to reshow later

                if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, "

                        + "disabling status bar expansion");
@@ -2178,7 +2189,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     */

    private void doKeyguardLocked(Bundle options) {

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

        if (!mExternallyEnabled) {

        if (!mExternallyEnabled

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

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



            mNeedToReshowWhenReenabled = true;

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

+45 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
    private @Mock ShadeWindowLogger mShadeWindowLogger;

    private @Captor ArgumentCaptor<KeyguardStateController.Callback>

            mKeyguardStateControllerCallback;

    private @Captor ArgumentCaptor<KeyguardUpdateMonitorCallback>

            mKeyguardUpdateMonitorCallbackCaptor;

    private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake();

    private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
@@ -236,6 +238,45 @@ 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

    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    public void doNotHideKeyguard_whenLockdown_onKeyguardNotEnabledExternally() {

        // GIVEN keyguard is enabled and lockdown occurred so the keyguard is showing

        mViewMediator.onSystemReady();

        mViewMediator.setKeyguardEnabled(true);

        TestableLooper.get(this).processAllMessages();

        captureKeyguardUpdateMonitorCallback();

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

        mKeyguardUpdateMonitorCallbackCaptor.getValue().onStrongAuthStateChanged(0);

        assertTrue(mViewMediator.isShowingAndNotOccluded());



        // WHEN keyguard is externally not enabled anymore

        mViewMediator.setKeyguardEnabled(false);



        // THEN keyguard is NOT dismissed; it continues to show

        TestableLooper.get(this).processAllMessages();

        assertTrue(mViewMediator.isShowingAndNotOccluded());

    }



    @Test

    public void testOnGoingToSleep_UpdatesKeyguardGoingAway() {

        mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER);
@@ -982,4 +1023,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
    private void captureKeyguardStateControllerCallback() {

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

    }



    private void captureKeyguardUpdateMonitorCallback() {

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

    }

}