commit 8f3e6d5c836353444082e4696f5e933266384580
author John Spurlock <jspurlock@google.com> Thu Nov 29 13:56:24 2012 -0500
committer John Spurlock <jspurlock@google.com> Thu Nov 29 14:18:35 2012 -0500
tree c505a47fcee126ae743c0c8b6ff27d952885ba15
parent 652678af4d18b9a6c18ce6a860de01d958bc82fe

Fix multiuser bug in StatusBarManagerService.

First, do no harm.

Bug:7638210
Change-Id: I113b574a021d601b0c79d65a3b4b72eeb4c667ad

services/java/com/android/server/StatusBarManagerService.java

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 @@
         // 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() {