Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev

Author: John Spurlock

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

@@ -170,7 +170,9 @@ private void disableLocked(int userId, int what, IBinder token, String pkg) {
         // 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() {