summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-19 20:34:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-19 20:34:15 +0000
commit504ba4c64e99db48cd7abf297b6ab486c6ff1b03 (patch)
treea52369a919e29938c4db1b21c4a2cd4166742c56
parentd53ddbcf340525c6a9b825409c6d4003f42fbbfe (diff)
parent765bbec608205a3a4e22951d3f45df410c73ab12 (diff)
Merge "Grant POST_NOTIFICATIONS to non-system carrier privileged apps" into tm-dev am: 765bbec608
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17598758 Change-Id: Ib286af6056bb0d32f70ecbbe51e66802f7dfaca9 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.java3
1 files changed, 2 insertions, 1 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 349174d95ec4..e58d73646bd6 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -1025,7 +1025,8 @@ final class DefaultPermissionGrantPolicy {
}
for (String packageName : packageNames) {
grantPermissionsToSystemPackage(NO_PM_CACHE, packageName, userId,
- PHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, SMS_PERMISSIONS,
+ PHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, SMS_PERMISSIONS);
+ grantPermissionsToPackage(NO_PM_CACHE, packageName, userId, false, false,
NOTIFICATION_PERMISSIONS);
}
}