diff options
| -rw-r--r-- | core/java/android/content/pm/LauncherApps.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 300955a05939..51871815d7da 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -176,6 +176,9 @@ public class LauncherApps { */ public void startActivityForProfile(ComponentName component, Rect sourceBounds, Bundle opts, UserHandle user) { + if (DEBUG) { + Log.i(TAG, "StartActivityForProfile " + component + " " + user.getIdentifier()); + } try { mService.startActivityAsUser(component, sourceBounds, opts, user); } catch (RemoteException re) { diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 6392bd442f94..031cba77f934 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -524,15 +524,14 @@ public class UserManager { private int getBadgeResIdForUser(int userHandle) { // Return the framework-provided badge. - if (userHandle == UserHandle.myUserId()) { - UserInfo user = getUserInfo(userHandle); - /* TODO: Allow managed profiles for other users in the future */ - if (!user.isManagedProfile() - || user.profileGroupId != getUserInfo(UserHandle.USER_OWNER).profileGroupId) { - return 0; + List<UserInfo> userProfiles = getProfiles(UserHandle.myUserId()); + for (UserInfo user : userProfiles) { + if (user.id == userHandle + && user.isManagedProfile()) { + return com.android.internal.R.drawable.ic_corp_badge; } } - return com.android.internal.R.drawable.ic_corp_badge; + return 0; } private Drawable getMergedDrawable(Drawable icon, Drawable badge) { |