am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev

* commit '7792b714b66e3af57bc243666b7843b0adf9c0b3':
  Don't forget to listen for USER_ALL broadcasts.
This commit is contained in:
Dan Sandler
2014-12-05 14:33:33 +00:00
committed by Android Git Automerger

View File

@@ -683,15 +683,12 @@ public abstract class BaseStatusBar extends SystemUI implements
Log.v(TAG, String.format("%s: current userid: %d, notification userid: %d",
n, thisUserId, notificationUserId));
}
synchronized (mCurrentProfiles) {
return notificationUserId == UserHandle.USER_ALL
|| mCurrentProfiles.get(notificationUserId) != null;
}
return isCurrentProfile(notificationUserId);
}
protected boolean isCurrentProfile(int userId) {
synchronized (mCurrentProfiles) {
return mCurrentProfiles.get(userId) != null;
return userId == UserHandle.USER_ALL || mCurrentProfiles.get(userId) != null;
}
}