Merge "Check uid for notification policy access." into nyc-mr1-dev

2016-06-29 15:41:43 +00:00
parent b71081e4e9 0cd1b78956
commit 488153094c
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1997,6 +1997,7 @@ public class NotificationManagerService extends SystemService {
                    android.Manifest.permission.MANAGE_NOTIFICATIONS)) {
                return;
            }
+            checkCallerIsSameApp(pkg);
            if (!checkPolicyAccess(pkg)) {
                Slog.w(TAG, "Notification policy access denied calling " + method);
                throw new SecurityException("Notification policy access denied");
@@ -3655,6 +3656,10 @@ public class NotificationManagerService extends SystemService {
        if (isCallerSystem()) {
            return;
        }
+        checkCallerIsSameApp(pkg);
+    }
+
+    private static void checkCallerIsSameApp(String pkg) {
        final int uid = Binder.getCallingUid();
        try {
            ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(