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

Merge "The system can post notifications for any package"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-02 19:42:45 +00:00
committed by Android (Google) Code Review
parent fdd15778b3 2a67ee8955
commit adfbe12f7d
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3050,6 +3050,10 @@ public class NotificationManagerService extends SystemService {
throw new IllegalArgumentException("null not allowed: pkg=" + pkg
+ " id=" + id + " notification=" + notification);
}
// The system can post notifications for any package, let us resolve that.
final int notificationUid = resolveNotificationUid(opPkg, callingUid, userId);
// Fix the notification as best we can.
try {
final ApplicationInfo ai = mPackageManagerClient.getApplicationInfoAsUser(
@@ -3069,13 +3073,13 @@ public class NotificationManagerService extends SystemService {
channelId = (new Notification.TvExtender(notification)).getChannel();
}
final NotificationChannel channel = mRankingHelper.getNotificationChannelWithFallback(pkg,
callingUid, channelId, false /* includeDeleted */);
notificationUid, channelId, false /* includeDeleted */);
final StatusBarNotification n = new StatusBarNotification(
pkg, opPkg, id, tag, callingUid, callingPid, notification,
pkg, opPkg, id, tag, notificationUid, callingPid, notification,
user, null, System.currentTimeMillis());
final NotificationRecord r = new NotificationRecord(getContext(), n, channel);
if (!checkDisqualifyingFeatures(userId, callingUid, id,tag, r)) {
if (!checkDisqualifyingFeatures(userId, notificationUid, id,tag, r)) {
return;
}
@@ -3101,6 +3105,19 @@ public class NotificationManagerService extends SystemService {
idOut[0] = id;
}
private int resolveNotificationUid(String opPackageName, int callingUid, int userId) {
// The system can post notifications on behalf of any package it wants
if (isCallerSystem() && opPackageName != null && !"android".equals(opPackageName)) {
try {
return getContext().getPackageManager()
.getPackageUidAsUser(opPackageName, userId);
} catch (NameNotFoundException e) {
/* ignore */
}
}
return callingUid;
}
/**
* Checks if a notification can be posted. checks rate limiter, snooze helper, and blocking.
*