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

Commit b978ce7f authored by Jason Monk's avatar Jason Monk
Browse files

Allow system to disable lockscreen 

Even when there is a pin.

Bug: 22920549
Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373
parent d5a6df6d

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 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; 
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;

import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
@@ -5367,6 +5366,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");