summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authorAltaf-Mahdi <altaf.mahdi@gmail.com>2015-02-16 12:13:39 +0000
committerRoman Birg <roman@cyngn.com>2016-02-08 16:14:47 -0800
commit45dec723d49f450f89868b7300099ebd19bb2de5 (patch)
tree716dbdb2ce75c7d4eee1c32a93dcdd65c8360810 /packages/SystemUI/src
parentc0a5008edf532d049bf0110935e4cf4aa91ac8d0 (diff)
downloadframeworks_base-45dec723d49f450f89868b7300099ebd19bb2de5.zip
frameworks_base-45dec723d49f450f89868b7300099ebd19bb2de5.tar.gz
frameworks_base-45dec723d49f450f89868b7300099ebd19bb2de5.tar.bz2
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
Diffstat (limited to 'packages/SystemUI/src')
-rwxr-xr-xpackages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java9
1 files 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;
}