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

Commit 5dd10bd1 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen" 

* commit 'e2e945a8':
  third part apps can disable the secret lockscreen
parents 66a51c70 e2e945a8

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

+5 −0
Original line number Diff line number Diff line
@@ -773,6 +773,11 @@ public class KeyguardViewMediator extends SystemUI { 
        synchronized (this) {

            if (DEBUG) Log.d(TAG, "setKeyguardEnabled(" + enabled + ")");



            if (isSecure()) {

                Log.d(TAG, "current mode is SecurityMode, ignore hide keyguard");

                return;

            }



            mExternallyEnabled = enabled;



            if (!enabled && mShowing) {