am 43658bae: am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev

* commit '43658bae9cdb5307d54fa36f3e57def9d0991150':
  Fix multiuser bug in StatusBarManagerService.
This commit is contained in:
John Spurlock
2012-11-29 14:28:18 -08:00
committed by Android Git Automerger

View File

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