Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddc014d authored by Junda Liu's avatar Junda Liu Committed by Android Git Automerger
Browse files

am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning... 

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

* commit '88c4e406':
  Grant SMS carrier provisioning app the permission to receive SMS.
parents 498cf7ac 88c4e406

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+8 −0
Original line number Diff line number Diff line
@@ -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);