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

Commit 98df1c6e 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: 031d3497 

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



Change-Id: Id2b4f9656cad815cb7a94d6fdacd0dc6c50013f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca34073d 031d3497

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

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

            }

        }

        }





        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }



        @Override

        @Override

        public void onTrustChanged(int userId) {

        public void onTrustChanged(int userId) {

            if (userId == KeyguardUpdateMonitor.getCurrentUser()) {

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

            mExternallyEnabled = enabled;





            if (!enabled && mShowing) {

            if (!enabled && mShowing) {

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

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

                    return;

                }

                if (mExitSecureCallback != null) {

                if (mExitSecureCallback != null) {

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

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

                    // we're in the process of handling a request to verify the user

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

            return;

        }

        }





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

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

        if (!mExternallyEnabled) {

        if (!mExternallyEnabled

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

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

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





            mNeedToReshowWhenReenabled = true;

            mNeedToReshowWhenReenabled = true;