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

Unverified Commit 68d20cfa authored by Beverly's avatar Beverly Committed by Kevin F. Haggerty
Browse files

On device lockdown, always show the keyguard 

Manual test steps:
1. Enable app pinning and disable "Ask for PIN before unpinning" setting
2. Pin an app (ie: Settings)
3. Lockdown from the power menu
Observe: user is brought to the keyguard, primary auth is required
to enter the device. After entering credential, the device is still in
app pinning mode.

Test: atest KeyguardViewMediatorTest
Test: manual steps outlined above
Bug: 218495634
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b23c2d5fb6630ea0da503b937f62880594b13e94)
Merged-In: I9a7c5e1acadabd4484e58573331f98dba895f2a2
Change-Id: I9a7c5e1acadabd4484e58573331f98dba895f2a2

Change-Id: Ia967920c8b3f2388d7a1d4ce7a717525b2680923
parent 580ee2c3

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

+9 −1
Original line number Diff line number Diff line
@@ -677,6 +677,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                }

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }

    };



    ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1535,7 +1542,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
        }



        // 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;