Merge "Don't lock down system user in demo mode" into oc-dr1-dev

am: 4f540fe8d0 Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689
2017-08-10 02:25:10 +00:00
parent 68cf0f4df8 4f540fe8d0
commit f3b6768601
1 changed files with 1 additions and 1 deletions
--- 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;
    }