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

Properly handle non split system user when showing bouncer

Browse Source 
am: b799d3f127

* commit 'b799d3f127f7410e8d0afe16343032e6115750fc':
  Properly handle non split system user when showing bouncer
This commit is contained in:
Toni Barzic
2016-02-22 20:14:04 +00:00
committed by android-build-merger
parent 53ff8e5573 b799d3f127
commit 8508ed5044
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
import android.app.ActivityManager;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Slog;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -91,7 +92,8 @@ public class KeyguardBouncer {
final int activeUserId = ActivityManager.getCurrentUser();
final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();
final boolean allowDismissKeyguard = activeUserId != UserHandle.USER_SYSTEM
final boolean allowDismissKeyguard =
!(UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM)
&& activeUserId == keyguardUserId;
// If allowed, try to dismiss the Keyguard. If no security auth (password/pin/pattern) is
// set, this will dismiss the whole Keyguard. Otherwise, show the bouncer.