diff options
| author | Junda Liu <junda@google.com> | 2015-08-17 18:58:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 18:58:19 +0000 |
| commit | f2cb6f7e3ea143ba4acace0821c9d49e363da7eb (patch) | |
| tree | 6669b6e3894f5df8a2a775f4513f9dd1af177f99 /services | |
| parent | a3fd27adcc655dd9566d72f290ac343704e8e4db (diff) | |
| parent | d878f5327793310d5fda083f800644bc96d6a6e8 (diff) | |
| download | frameworks_base-f2cb6f7e3ea143ba4acace0821c9d49e363da7eb.zip frameworks_base-f2cb6f7e3ea143ba4acace0821c9d49e363da7eb.tar.gz frameworks_base-f2cb6f7e3ea143ba4acace0821c9d49e363da7eb.tar.bz2 | |
Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 8 |
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 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 @@ 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); |