am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit '88c4e40636e2d2022b7afdacccb4de0d07d7703f':
  Grant SMS carrier provisioning app the permission to receive SMS.
This commit is contained in:
Junda Liu
2015-08-17 19:20:10 +00:00
committed by Android Git Automerger

View File

@@ -363,6 +363,14 @@ final class DefaultPermissionGrantPolicy {
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);