summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-06-17 19:24:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-17 19:24:58 +0000
commit058b58df363f2af52b80e51f823fc49de1f0e387 (patch)
treed05309f7954eebb94c3468abcd46bd2119208712
parent40b4671c26fe889f89c5536f7c46296edcb3c402 (diff)
parent7f3f9c454c921f388e4ba14eea6f6466a3f25afc (diff)
Merge "Add Ad Services pregrant to DPGP" into tm-dev am: 7f3f9c454c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18919729 Change-Id: Ic88093179538a1c3d8e05ae641ad5900e7cabf2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index cc1c943c2540..0ae92b4ee846 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -911,6 +911,11 @@ final class DefaultPermissionGrantPolicy {
grantSystemFixedPermissionsToSystemPackage(pm,
MidiManager.BLUETOOTH_MIDI_SERVICE_PACKAGE, userId,
NEARBY_DEVICES_PERMISSIONS);
+
+ // Ad Service
+ String commonServiceAction = "android.adservices.AD_SERVICES_COMMON_SERVICE";
+ grantPermissionsToSystemPackage(pm, getDefaultSystemHandlerServicePackage(pm,
+ commonServiceAction, userId), userId, NOTIFICATION_PERMISSIONS);
}
private String getDefaultSystemHandlerActivityPackageForCategory(PackageManagerWrapper pm,