commit bf6f182f36e1bf14860f8ff97d63af7b17ad182c
author Julia Reynolds <juliacr@google.com> Wed Mar 27 12:15:57 2019 -0400
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 16 22:37:11 2019 +0000
tree 7dec754b399f76acc6c54a37cbc4ef6565ffa8eb
parent 64f189a7a08d7182e68a73db1442b61081d5a2ee

[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

Test: atest
Fixes: 128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit 657d164136199126ae241848887de0230699cea0)
(cherry picked from commit bed6193b5954565f60afb5f5f9868d89991354d7)

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 566e5f5..4baec05 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1767,6 +1767,11 @@
         @Override
         public boolean areNotificationsEnabledForPackage(String pkg, int uid) {
             checkCallerIsSystemOrSameApp(pkg);
+            if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {
+                getContext().enforceCallingPermission(
+                        android.Manifest.permission.INTERACT_ACROSS_USERS,
+                        "canNotifyAsPackage for uid " + uid);
+            }
 
             return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;
         }