drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev

Browse Source 
* commit '03f7ebfeaadb3f03c9a9a6405276fb702ad11fe1':
  Relax permission requirements for posting notifications across users
This commit is contained in:
Amith Yamasani
2012-10-31 13:09:42 -07:00
committed by Android Git Automerger
parent 53b029b620 03f7ebfeaa
commit 47ece2e53e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NotificationManagerService.java
View File

@ -889,7 +889,7 @@ public class NotificationManagerService extends INotificationManager.Stub
final boolean isSystemNotification = ("android".equals(pkg)); final boolean isSystemNotification = ("android".equals(pkg));
userId = ActivityManager.handleIncomingUser(callingPid, userId = ActivityManager.handleIncomingUser(callingPid,
callingUid, userId, true, true, "enqueueNotification", pkg); callingUid, userId, true, false, "enqueueNotification", pkg);
final UserHandle user = new UserHandle(userId); final UserHandle user = new UserHandle(userId);
// Limit the number of notifications that any given package except the android // Limit the number of notifications that any given package except the android
@ -1287,7 +1287,7 @@ public class NotificationManagerService extends INotificationManager.Stub
public void cancelNotificationWithTag(String pkg, String tag, int id, int userId) { public void cancelNotificationWithTag(String pkg, String tag, int id, int userId) {
checkCallerIsSystemOrSameApp(pkg); checkCallerIsSystemOrSameApp(pkg);
userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
Binder.getCallingUid(), userId, true, true, "cancelNotificationWithTag", pkg); Binder.getCallingUid(), userId, true, false, "cancelNotificationWithTag", pkg);
// Don't allow client applications to cancel foreground service notis. // Don't allow client applications to cancel foreground service notis.
cancelNotification(pkg, tag, id, 0, cancelNotification(pkg, tag, id, 0,
Binder.getCallingUid() == Process.SYSTEM_UID Binder.getCallingUid() == Process.SYSTEM_UID
@ -1298,7 +1298,7 @@ public class NotificationManagerService extends INotificationManager.Stub
checkCallerIsSystemOrSameApp(pkg); checkCallerIsSystemOrSameApp(pkg);
userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
Binder.getCallingUid(), userId, true, true, "cancelAllNotifications", pkg); Binder.getCallingUid(), userId, true, false, "cancelAllNotifications", pkg);
// Calling from user space, don't allow the canceling of actively // Calling from user space, don't allow the canceling of actively
// running foreground services. // running foreground services.

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -4575,7 +4575,7 @@ public final class ActivityManagerService extends ActivityManagerNative
int callingUid = Binder.getCallingUid(); int callingUid = Binder.getCallingUid();
int origUserId = userId; int origUserId = userId;
userId = handleIncomingUser(Binder.getCallingPid(), callingUid, userId, userId = handleIncomingUser(Binder.getCallingPid(), callingUid, userId,
type == ActivityManager.INTENT_SENDER_BROADCAST, true, type == ActivityManager.INTENT_SENDER_BROADCAST, false,
"getIntentSender", null); "getIntentSender", null);
if (origUserId == UserHandle.USER_CURRENT) { if (origUserId == UserHandle.USER_CURRENT) {
// We don't want to evaluate this until the pending intent is // We don't want to evaluate this until the pending intent is