From 45dec723d49f450f89868b7300099ebd19bb2de5 Mon Sep 17 00:00:00 2001 From: Altaf-Mahdi Date: Mon, 16 Feb 2015 12:13:39 +0000 Subject: Profiles: Disable lock screen after boot This brings it inline with stock behavior and also fixes a couple of issues. If lock screen was disabled via profiles, on boot you would end up with no home or recents buttons and if you had a simpin set you would be faced with a black screen with no way to access the phone unless you popped the sim out. Ref: CYNGNOS-1930 Change-Id: I9f1f9f467647e31525a1179dc1a0ce7b9dc3285f --- .../src/com/android/systemui/keyguard/KeyguardViewMediator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 3024c27..b1f19bb 100755 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -920,9 +920,9 @@ public class KeyguardViewMediator extends SystemUI { if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by profile"); return true; } - } + } return false; - } + } /** * A dream started. We should lock after the usual screen-off lock timeout but only @@ -1214,6 +1214,11 @@ public class KeyguardViewMediator extends SystemUI { if (isKeyguardDisabled(KeyguardUpdateMonitor.getCurrentUser()) && !lockedOrMissing) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off"); + // update state + mShowing = false; + updateActivityLockScreenState(); + adjustStatusBarLocked(); + userActivity(); return; } -- cgit v1.1