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

Merge "Don't show UNLOCK button when there are no users." into nyc-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2016-02-23 15:40:06 +00:00
committed by Android (Google) Code Review
parent 791a7df8b2 ec018434d4
commit e2f0f73591
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -79,6 +79,11 @@ public class KeyguardBouncer {
}
public void show(boolean resetSecuritySelection) {
final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();
if (keyguardUserId == UserHandle.USER_SYSTEM && UserManager.isSplitSystemUser()) {
// In split system user mode, we never unlock system user.
return;
}
mFalsingManager.onBouncerShown();
ensureView();
if (resetSecuritySelection) {
@@ -91,7 +96,6 @@ public class KeyguardBouncer {
}
final int activeUserId = ActivityManager.getCurrentUser();
final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();
final boolean allowDismissKeyguard =
!(UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM)
&& activeUserId == keyguardUserId;