提交: 530518de4f7b0e82dfb34a6ebc5979d8da0701b4 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修訂: 530518de4f7b0e82dfb34a6ebc5979d8da0701b4 (tree)
• 時間: 2019-04-16 04:15:59
• 作者: Julia Reynolds <juliacr@goog...>
• Commiter: Greg Wroblewski

Log Message

[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage

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

Change Summary

• modified: services/core/java/com/android/server/notification/NotificationManagerService.java

差異

--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1432,6 +1432,12 @@ 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 (mAppOps.checkOpNoThrow(AppOpsManager.OP_POST_NOTIFICATION, uid, pkg)
                     == AppOpsManager.MODE_ALLOWED) && !isPackageSuspendedForUser(pkg, uid);
         }