Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid security exception when requesting badging"

Browse Source
This commit is contained in:
Amith Yamasani
2014-04-09 00:26:17 +00:00
committed by Android (Google) Code Review
parent 91c8f753ab 5abdbb6560
commit cc4e9e69d2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/LauncherApps.java
View File

@@ -176,6 +176,9 @@ public class LauncherApps {
*/ */
public void startActivityForProfile(ComponentName component, Rect sourceBounds, public void startActivityForProfile(ComponentName component, Rect sourceBounds,
Bundle opts, UserHandle user) { Bundle opts, UserHandle user) {
if (DEBUG) {
Log.i(TAG, "StartActivityForProfile " + component + " " + user.getIdentifier());
}
try { try {
mService.startActivityAsUser(component, sourceBounds, opts, user); mService.startActivityAsUser(component, sourceBounds, opts, user);
} catch (RemoteException re) { } catch (RemoteException re) {

13
core/java/android/os/UserManager.java
View File

@@ -524,15 +524,14 @@ public class UserManager {
private int getBadgeResIdForUser(int userHandle) { private int getBadgeResIdForUser(int userHandle) {
// Return the framework-provided badge. // Return the framework-provided badge.
if (userHandle == UserHandle.myUserId()) { List<UserInfo> userProfiles = getProfiles(UserHandle.myUserId());
UserInfo user = getUserInfo(userHandle); for (UserInfo user : userProfiles) {
/* TODO: Allow managed profiles for other users in the future */ if (user.id == userHandle
if (!user.isManagedProfile() && user.isManagedProfile()) {
|| user.profileGroupId != getUserInfo(UserHandle.USER_OWNER).profileGroupId) { return com.android.internal.R.drawable.ic_corp_badge;
return 0;
} }
} }
return com.android.internal.R.drawable.ic_corp_badge; return 0;
} }
private Drawable getMergedDrawable(Drawable icon, Drawable badge) { private Drawable getMergedDrawable(Drawable icon, Drawable badge) {