summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-10-04 14:51:51 -0400
committerJohn Spurlock <jspurlock@google.com>2012-10-04 14:51:51 -0400
commit4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8 (patch)
tree241f2cc34591502473590f45fe6e78f6ab323cf8 /services
parentebf7e2851cab55348153fca299c52042b125924d (diff)
downloadframeworks_base-4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8.zip
frameworks_base-4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8.tar.gz
frameworks_base-4e6922d89e72e79a8ab31ae2cb8a19d85bee91f8.tar.bz2
Reset status bar in keyguard, fix MU status bar bug.
Two things going on here, status bar disabled flags need to be reset on user switch. Also make status bar's internal disable-record lookup multi-user aware. Bug:7278793 Change-Id: I1d7088d956a065330736da4c09cc1874c528c133
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/StatusBarManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java
index 5d9441b..439eebe 100644
--- a/services/java/com/android/server/StatusBarManagerService.java
+++ b/services/java/com/android/server/StatusBarManagerService.java
@@ -544,7 +544,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub
int i;
for (i=0; i<N; i++) {
DisableRecord t = mDisableRecords.get(i);
- if (t.token == token) {
+ if (t.token == token && t.userId == userId) {
tok = t;
break;
}