Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 498cf7ac93 88c4e40636
commit 9ddc014da2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
View File

@@ -363,6 +363,14 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(cbrPackage, SMS_PERMISSIONS, userId); 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 // Calendar
Intent calendarIntent = new Intent(Intent.ACTION_MAIN); Intent calendarIntent = new Intent(Intent.ACTION_MAIN);
calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR); calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR);