summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJustin Harrison <astyrrian@google.com>2014-12-08 19:14:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-08 19:14:38 +0000
commit79e346fe1bdb4f03e318c9f7ff3b3c7178800413 (patch)
tree4d38092175406a5c553f023500cf7ff3ca2bbb14 /packages/SystemUI
parent72ebd648b790b524a9ba96c924c57193c31b5052 (diff)
parent66351d623acfe67033c605cce4a5d52faab3fb96 (diff)
downloadframeworks_base-79e346fe1bdb4f03e318c9f7ff3b3c7178800413.zip
frameworks_base-79e346fe1bdb4f03e318c9f7ff3b3c7178800413.tar.gz
frameworks_base-79e346fe1bdb4f03e318c9f7ff3b3c7178800413.tar.bz2
am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev
* commit '66351d623acfe67033c605cce4a5d52faab3fb96': Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 206fc43..7ac0daf 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -72,6 +72,7 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.phone.StatusBarWindowManager;
import java.util.ArrayList;
+import java.util.List;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
@@ -1217,7 +1218,12 @@ public class KeyguardViewMediator extends SystemUI {
synchronized (this) {
if (mBootCompleted) {
final UserHandle currentUser = new UserHandle(mLockPatternUtils.getCurrentUser());
- mContext.sendBroadcastAsUser(USER_PRESENT_INTENT, currentUser);
+ final UserManager um = (UserManager) mContext.getSystemService(
+ Context.USER_SERVICE);
+ List <UserInfo> userHandles = um.getProfiles(currentUser.getIdentifier());
+ for (UserInfo ui : userHandles) {
+ mContext.sendBroadcastAsUser(USER_PRESENT_INTENT, ui.getUserHandle());
+ }
} else {
mBootSendUserPresent = true;
}