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

am: 2256fd4e11 Change-Id: I1658f2dc59428265adf385ec2e9c579abbefb023
2019-04-10 17:19:16 -07:00
parent 5d35ad7446 2256fd4e11
commit 51fee974a9
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
@@ -1639,6 +1639,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;
        }