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

Fix NotificationListenerService fail to mirror work notification

Browse Source 
am: 4dc008c

* commit '4dc008cda2980fabb6acbf8a3b7096d1090ee36f':
  Fix NotificationListenerService fail to mirror work notification
This commit is contained in:
Tony Mak
2016-03-16 11:28:35 +00:00
committed by android-build-merger
parent 50ce9082cf 4dc008cda2
commit 63dbf9c216
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/ApplicationPackageManager.java
View File

@@ -1147,7 +1147,7 @@ public class ApplicationPackageManager extends PackageManager {
}
private Drawable getManagedProfileIconForDensity(UserHandle user, int drawableId, int density) {
UserInfo userInfo = getUserIfProfile(user.getIdentifier());
UserInfo userInfo = getUserInfo(user.getIdentifier());
if (userInfo != null && userInfo.isManagedProfile()) {
return getDrawableForDensity(drawableId, density);
}
@@ -1156,7 +1156,7 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
UserInfo userInfo = getUserIfProfile(user.getIdentifier());
UserInfo userInfo = getUserInfo(user.getIdentifier());
if (userInfo != null && userInfo.isManagedProfile()) {
return Resources.getSystem().getString(
com.android.internal.R.string.managed_profile_label_badge, label);
@@ -2252,21 +2252,15 @@ public class ApplicationPackageManager extends PackageManager {
private int getBadgeResIdForUser(int userHandle) {
// Return the framework-provided badge.
UserInfo userInfo = getUserIfProfile(userHandle);
UserInfo userInfo = getUserInfo(userHandle);
if (userInfo != null && userInfo.isManagedProfile()) {
return com.android.internal.R.drawable.ic_corp_icon_badge;
}
return 0;
}
private UserInfo getUserIfProfile(int userHandle) {
List<UserInfo> userProfiles = getUserManager().getProfiles(mContext.getUserId());
for (UserInfo user : userProfiles) {
if (user.id == userHandle) {
return user;
}
}
return null;
private UserInfo getUserInfo(int userHandle) {
return getUserManager().getUserInfo(userHandle);
}
/** {@hide} */

13
core/java/android/app/Notification.java
View File

@@ -3173,16 +3173,9 @@ public class Notification implements Parcelable
}
private void bindHeaderAppName(RemoteViews contentView) {
PackageManager packageManager = mContext.getPackageManager();
ApplicationInfo info = null;
try {
info = packageManager.getApplicationInfo(mContext.getApplicationInfo().packageName,
0);
} catch (final NameNotFoundException e) {
return;
}
CharSequence appName = info != null ? packageManager.getApplicationLabel(info)
: null;
CharSequence appName = mContext.getPackageManager()
.getApplicationLabel(mContext.getApplicationInfo());
if (TextUtils.isEmpty(appName)) {
return;
}

6
core/java/android/content/pm/PackageManager.java
View File

@@ -4387,10 +4387,8 @@ public abstract class PackageManager {
int badgeDensity);
/**
* If the target user is a managed profile of the calling user or if the
* target user is the caller and is itself a managed profile, then this
* returns a badged copy of the given icon to be able to distinguish it from
* the original icon. For badging an arbitrary drawable use
* If the target user is a managed profile, then this returns a badged copy of the given icon
* to be able to distinguish it from the original icon. For badging an arbitrary drawable use
* {@link #getUserBadgedDrawableForDensity(
* android.graphics.drawable.Drawable, UserHandle, android.graphics.Rect, int)}.
* <p>

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

@@ -972,7 +972,8 @@ public class UserManager {
/**
* Returns the UserInfo object describing a specific user.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission or the caller is
* in the same profile group of target user.
* @param userHandle the user handle of the user whose information is being requested.
* @return the UserInfo object for a specific user.
* @hide

27
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -641,7 +641,12 @@ public class UserManagerService extends IUserManager.Stub {
@Override
public UserInfo getUserInfo(int userId) {
checkManageUsersPermission("query user");
if (!hasManageUsersPermission()
&& !isSameProfileGroupLP(UserHandle.getCallingUserId(), userId)) {
throw new SecurityException(
"You need MANAGE_USERS permission to: query users outside profile group");
}
synchronized (mUsersLock) {
return getUserInfoLU(userId);
}
@@ -1196,17 +1201,27 @@ public class UserManagerService extends IUserManager.Stub {
*
* @param message used as message if SecurityException is thrown
* @throws SecurityException if the caller is not system or root
* @see #hasManageUsersPermission()
*/
private static final void checkManageUsersPermission(String message) {
final int uid = Binder.getCallingUid();
if (!UserHandle.isSameApp(uid, Process.SYSTEM_UID) && uid != Process.ROOT_UID
&& ActivityManager.checkComponentPermission(
android.Manifest.permission.MANAGE_USERS,
uid, -1, true) != PackageManager.PERMISSION_GRANTED) {
if (!hasManageUsersPermission()) {
throw new SecurityException("You need MANAGE_USERS permission to: " + message);
}
}
/**
* @return whether the calling UID is system UID or root's UID or the calling app has the
* {@link android.Manifest.permission#MANAGE_USERS MANAGE_USERS}.
*/
private static final boolean hasManageUsersPermission() {
final int callingUid = Binder.getCallingUid();
return UserHandle.isSameApp(callingUid, Process.SYSTEM_UID)
|| callingUid == Process.ROOT_UID
|| ActivityManager.checkComponentPermission(
android.Manifest.permission.MANAGE_USERS,
callingUid, -1, true) == PackageManager.PERMISSION_GRANTED;
}
/**
* Enforces that only the system UID or root's UID (on any user) can make certain calls to the
* UserManager.