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

2017-08-10 02:17:48 +00:00
parent a4b5e0893f 338c6ed5d0
commit 4f540fe8d0
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;
    }