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

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

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

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

* commit '9ddc014d':
  Grant SMS carrier provisioning app the permission to receive SMS.
parents df1fffe2 9ddc014d

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);