commit e1d8b9818980b8350ea3ae7a4580f9bd25b6aef3
author Julia Reynolds <juliacr@google.com> Fri Jul 15 14:17:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 15 14:17:56 2016 +0000
tree f6ddf3040dcd70781d779b9a7a330658816b588a
parent ff58d7c918d4923f6df44f55d21d62bcaf7068f6
parent 5c6db3af89c817976578bf8a3df9db46818aae2a

Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am: 234e1c25e4 am: 8e8bb6633c
am: 5c6db3af89

Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519

services/core/java/com/android/server/notification/NotificationManagerService.java

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 288810c..e852770 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1643,6 +1643,7 @@
         }
 
         private void enforcePolicyAccess(String pkg, String method) {
+            checkCallerIsSameApp(pkg);
             if (!checkPolicyAccess(pkg)) {
                 Slog.w(TAG, "Notification policy access denied calling " + method);
                 throw new SecurityException("Notification policy access denied");
@@ -3131,6 +3132,10 @@
         if (isCallerSystem()) {
             return;
         }
+        checkCallerIsSameApp(pkg);
+    }
+
+    private static void checkCallerIsSameApp(String pkg) {
         final int uid = Binder.getCallingUid();
         try {
             ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(