diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-31 13:11:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 13:11:50 -0700 |
| commit | d02f231318014925bead88ce9408c3c37f9a0e8b (patch) | |
| tree | c7a83dcf66e60d8033c4a54b9cbb7bfc0310231a /services/java/com | |
| parent | 196f1408eb0fe55040b2b40074518dca58558a42 (diff) | |
| parent | 47ece2e53e50201a6f73fb7a554d856f3b4519c8 (diff) | |
| download | frameworks_base-d02f231318014925bead88ce9408c3c37f9a0e8b.zip frameworks_base-d02f231318014925bead88ce9408c3c37f9a0e8b.tar.gz frameworks_base-d02f231318014925bead88ce9408c3c37f9a0e8b.tar.bz2 | |
am 47ece2e5: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
* commit '47ece2e53e50201a6f73fb7a554d856f3b4519c8':
Relax permission requirements for posting notifications across users
Diffstat (limited to 'services/java/com')
| -rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 4a54efe..0e171cd 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -889,7 +889,7 @@ public class NotificationManagerService extends INotificationManager.Stub final boolean isSystemNotification = ("android".equals(pkg)); userId = ActivityManager.handleIncomingUser(callingPid, - callingUid, userId, true, true, "enqueueNotification", pkg); + callingUid, userId, true, false, "enqueueNotification", pkg); final UserHandle user = new UserHandle(userId); // 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) { checkCallerIsSystemOrSameApp(pkg); 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. cancelNotification(pkg, tag, id, 0, Binder.getCallingUid() == Process.SYSTEM_UID @@ -1298,7 +1298,7 @@ public class NotificationManagerService extends INotificationManager.Stub checkCallerIsSystemOrSameApp(pkg); 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 // running foreground services. diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 5722326..d2cd646 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -4575,7 +4575,7 @@ public final class ActivityManagerService extends ActivityManagerNative int callingUid = Binder.getCallingUid(); int origUserId = userId; userId = handleIncomingUser(Binder.getCallingPid(), callingUid, userId, - type == ActivityManager.INTENT_SENDER_BROADCAST, true, + type == ActivityManager.INTENT_SENDER_BROADCAST, false, "getIntentSender", null); if (origUserId == UserHandle.USER_CURRENT) { // We don't want to evaluate this until the pending intent is |