summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-08-13 14:25:49 -0700
committerJunda Liu <junda@google.com>2015-08-14 17:24:43 -0700
commitd878f5327793310d5fda083f800644bc96d6a6e8 (patch)
tree1114607cbd953450e1dee5c9faebe34dfe69c135 /services
parentf75577295765ca13bf3d0d5bffa81b569cb88da2 (diff)
downloadframeworks_base-d878f5327793310d5fda083f800644bc96d6a6e8.zip
frameworks_base-d878f5327793310d5fda083f800644bc96d6a6e8.tar.gz
frameworks_base-d878f5327793310d5fda083f800644bc96d6a6e8.tar.bz2
Grant SMS carrier provisioning app the permission to receive SMS.
Bug: b/22982966 Change-Id: I4af525532e2f97973ba255bf8dbb002e42997eea
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 71a2d59..1fb3c58 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -363,6 +363,14 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, false, userId);
}
+ // Carrier Provisioning Service
+ Intent carrierProvIntent = new Intent(Intents.SMS_CARRIER_PROVISION_ACTION);
+ PackageParser.Package carrierProvPackage =
+ getDefaultSystemHandlerServicePackageLPr(carrierProvIntent, userId);
+ if (carrierProvPackage != null && doesPackageSupportRuntimePermissions(carrierProvPackage)) {
+ grantRuntimePermissionsLPw(carrierProvPackage, SMS_PERMISSIONS, false, userId);
+ }
+
// Calendar
Intent calendarIntent = new Intent(Intent.ACTION_MAIN);
calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR);