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

Commit 9b1697cd authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am e0d9fe59: am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow... 

am e0d9fe59: am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit 'e0d9fe59':
  Allow system to disable lockscreen
parents 56088b32 e0d9fe59

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

+0 −5
Original line number Diff line number Diff line
@@ -841,11 +841,6 @@ 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) {

services/core/java/com/android/server/wm/WindowManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -5363,6 +5363,12 @@ public class WindowManagerService extends IWindowManager.Stub 
            != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Requires DISABLE_KEYGUARD permission");

        }

        // If this isn't coming from the system then don't allow disabling the lockscreen

        // to bypass security.

        if (Binder.getCallingUid() != Process.SYSTEM_UID && isKeyguardSecure()) {

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

            return;

        }



        if (token == null) {

            throw new IllegalArgumentException("token == null");