From 31b844ba0cf418b758fbe45023d0202f208c0191 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 21 Nov 2014 13:55:09 +0100 Subject: [PATCH] Explicitly specify user for public mode Bug: 18417850 Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2 --- .../src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- .../systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 3fca56d81015..daabcbd4341c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3183,6 +3183,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, public void userSwitched(int newUserId) { if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId); animateCollapsePanels(); + updatePublicMode(); updateNotifications(); resetUserSetupObserver(); setControllerUsers(); @@ -3674,7 +3675,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private void updatePublicMode() { setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing() - && mStatusBarKeyguardViewManager.isSecure()); + && mStatusBarKeyguardViewManager.isSecure(mCurrentUserId)); } private void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 65d231e89437..cec155936aa6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -426,4 +426,8 @@ public class StatusBarKeyguardViewManager { public boolean isGoingToNotificationShade() { return mPhoneStatusBar.isGoingToNotificationShade(); } + + public boolean isSecure(int userId) { + return mBouncer.isSecure() || mLockPatternUtils.isSecure(userId); + } } -- 2.11.0