summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christine Franks <christyfranks@google.com> 2017-08-08 09:39:16 -0700
committer Christine Franks <christyfranks@google.com> 2017-08-08 09:40:40 -0700
commit338c6ed5d028d0597247f23de91aadb45087bf82 (patch)
tree7cd7ee4d06564c8f48d3aa0a3a148b211691c84f
parent27eb322ed2d04bab3850e05e9a0a5fb08f65026f (diff)
Don't lock down system user in demo mode
Bug: 62712426 Test: manual - user 0 no longer locked down in demo mode Change-Id: I3618775a48b541a42a316e27be297a012a7227b2
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index e23875f6c094..d132e761c591 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -659,7 +659,7 @@ public class KeyguardViewMediator extends SystemUI {
}
boolean mustNotUnlockCurrentUser() {
- return (UserManager.isSplitSystemUser() || UserManager.isDeviceInDemoMode(mContext))
+ return UserManager.isSplitSystemUser()
&& KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM;
}