Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-10 02:17:48 +00:00
committed by Android (Google) Code Review
parent a4b5e0893f 338c6ed5d0
commit 4f540fe8d0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -659,7 +659,7 @@ public class KeyguardViewMediator extends SystemUI {
} }
boolean mustNotUnlockCurrentUser() { boolean mustNotUnlockCurrentUser() {
return (UserManager.isSplitSystemUser() || UserManager.isDeviceInDemoMode(mContext)) return UserManager.isSplitSystemUser()
&& KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM; && KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM;
} }