Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am: 2256fd4e11

am: 51fee974a9 Change-Id: I5c0f89e5614901b57880fff5b59a2f6766893903
2019-04-10 17:44:09 -07:00
parent 03cddd8562 51fee974a9
commit 19ad060bf0
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
@@ -1767,6 +1767,11 @@ public class NotificationManagerService extends SystemService {
        @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;
        }