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

Commit ae62a32d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am:... 

Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d3497 am: 98df1c6e am: 775cbd02

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



Change-Id: Ief8cb81eea2d7f2402bfa20de3abab9d9ab2a75b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 868bc803 775cbd02

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

+14 −2
Original line number Diff line number Diff line
@@ -663,6 +663,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }



        @Override

        public void onTrustChanged(int userId) {

            if (userId == KeyguardUpdateMonitor.getCurrentUser()) {
@@ -1308,6 +1315,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            mExternallyEnabled = enabled;



            if (!enabled && mShowing) {

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

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

                    return;

                }

                if (mExitSecureCallback != null) {

                    if (DEBUG) Log.d(TAG, "in process of verifyUnlock request, ignoring");

                    // we're in the process of handling a request to verify the user
@@ -1524,8 +1535,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
            return;

        }



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

        if (!mExternallyEnabled) {

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

        if (!mExternallyEnabled

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

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



            mNeedToReshowWhenReenabled = true;