am e7194f99: am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
* commit 'e7194f9954866fafcaeb2089bee62f0e550d02d7':
Grant SMS carrier provisioning app the permission to receive SMS.
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index d2a70df..96a5e00 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 @@
grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, 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);