From e63ba4b03db386505f6973246be73cf38e0be128 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Fri, 5 Dec 2014 00:26:24 -0500 Subject: [PATCH] Don't forget to listen for USER_ALL broadcasts. The ActivityManager.closeSystemDialogs() call (used by, among other things, the home button) broadcasts ACTION_CLOSE_SYSTEM_DIALOGS for UserHandle.USER_ALL, rather than any one user. Bug: 18629414 Change-Id: I89bfa3f556866e1b27987be2753ce83fd0313998 --- .../src/com/android/systemui/statusbar/BaseStatusBar.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 57ac4b0dad506..2b6ac26fc2abf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -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; } }