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

Commit 0048acfc authored by Pierre-Laurent Coirier's avatar Pierre-Laurent Coirier Committed by android-build-merger
Browse files

Merge "Grant fixed SMS & Phone permission to package handling the twinning... 

Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev
am: 54c38088

* commit '54c38088':
  Grant fixed SMS & Phone permission to package handling the twinning settings intent.
parents 21c47d1b 54c38088

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

+16 −1
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ final class DefaultPermissionGrantPolicy { 
        STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);

    }



    private static final String ACTION_TWINNING =

            "com.google.android.clockwork.intent.TWINNING_SETTINGS";



    private final PackageManagerService mService;



    private PackagesProvider mImePackagesProvider;
@@ -571,8 +574,9 @@ final class DefaultPermissionGrantPolicy { 
                grantRuntimePermissionsLPw(musicPackage, STORAGE_PERMISSIONS, userId);

            }



            // Android Wear Home

            // Android Wear

            if (mService.hasSystemFeature(PackageManager.FEATURE_WATCH)) {

                // Android Wear Home

                Intent homeIntent = new Intent(Intent.ACTION_MAIN);

                homeIntent.addCategory(Intent.CATEGORY_HOME_MAIN);
@@ -589,6 +593,17 @@ final class DefaultPermissionGrantPolicy { 
                    grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,

                            userId);

                }



                // AT&T NumberSync

                Intent twinningIntent = new Intent(ACTION_TWINNING);

                PackageParser.Package twinningPackage = getDefaultSystemHandlerActivityPackageLPr(

                        twinningIntent, userId);



                if (twinningPackage != null

                        && doesPackageSupportRuntimePermissions(twinningPackage)) {

                    grantRuntimePermissionsLPw(twinningPackage, PHONE_PERMISSIONS, false, userId);

                    grantRuntimePermissionsLPw(twinningPackage, SMS_PERMISSIONS, false, userId);

                }

            }



            mService.mSettings.onDefaultRuntimePermissionsGrantedLPr(userId);