From 8f3e6d5c836353444082e4696f5e933266384580 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 29 Nov 2012 13:56:24 -0500 Subject: Fix multiuser bug in StatusBarManagerService. First, do no harm. Bug:7638210 Change-Id: I113b574a021d601b0c79d65a3b4b72eeb4c667ad --- services/java/com/android/server/StatusBarManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'services') diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java index 439eebe..1fe98af 100644 --- a/services/java/com/android/server/StatusBarManagerService.java +++ b/services/java/com/android/server/StatusBarManagerService.java @@ -170,7 +170,9 @@ public class StatusBarManagerService extends IStatusBarService.Stub // so they are paired correctly. The messages on the handler will be // handled in the order they were enqueued, but will be outside the lock. manageDisableListLocked(userId, what, token, pkg); - final int net = gatherDisableActionsLocked(userId); + + // Ensure state for the current user is applied, even if passed a non-current user. + final int net = gatherDisableActionsLocked(mCurrentUserId); if (net != mDisabled) { mDisabled = net; mHandler.post(new Runnable() { -- cgit v1.1