diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-29 11:45:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-29 11:45:57 -0800 |
| commit | 143d73dab5bf3fe6b8835660543d3d03e781618f (patch) | |
| tree | d516bc25a9e84219398b769f69101760317e81eb /services | |
| parent | 958343c19f8a87dfb8967431684da3239ac20272 (diff) | |
| parent | 8f3e6d5c836353444082e4696f5e933266384580 (diff) | |
| download | frameworks_base-143d73dab5bf3fe6b8835660543d3d03e781618f.zip frameworks_base-143d73dab5bf3fe6b8835660543d3d03e781618f.tar.gz frameworks_base-143d73dab5bf3fe6b8835660543d3d03e781618f.tar.bz2 | |
Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/StatusBarManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
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() { |