[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am: a2b2e377a0 am: 00121902b0 am: 777c45416e am: 0bf87880d8

Change-Id: If90b329955ca2514e6c236932614648670d440ea
This commit is contained in:
Android Build Merger (Role)
2019-04-09 22:29:04 +00:00

View File

@@ -1432,6 +1432,12 @@ public class NotificationManagerService extends SystemService {
@Override @Override
public boolean areNotificationsEnabledForPackage(String pkg, int uid) { public boolean areNotificationsEnabledForPackage(String pkg, int uid) {
checkCallerIsSystemOrSameApp(pkg); 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) return (mAppOps.checkOpNoThrow(AppOpsManager.OP_POST_NOTIFICATION, uid, pkg)
== AppOpsManager.MODE_ALLOWED) && !isPackageSuspendedForUser(pkg, uid); == AppOpsManager.MODE_ALLOWED) && !isPackageSuspendedForUser(pkg, uid);
} }