| commit | ff264d07cae23467111c2d3956baf19c013f9ff4 | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Aug 10 02:32:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 02:32:47 2017 +0000 |
| tree | 2a3b47f2293a750e9d984aed7f024b7dfbea1b63 | |
| parent | dc8deb9f5c69ad822c5bb73b100874f87dbea2fd [diff] | |
| parent | f3b6768601b466aa8d200a88e504a910b7e76981 [diff] |
Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: f3b6768601 Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index e23875f..d132e76 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 @@ } boolean mustNotUnlockCurrentUser() { - return (UserManager.isSplitSystemUser() || UserManager.isDeviceInDemoMode(mContext)) + return UserManager.isSplitSystemUser() && KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM; }