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

Commit 5250bc61 authored by Rodrigo Lagos's avatar Rodrigo Lagos Committed by Automerger Merge Worker
Browse files

Merge "Add pre-grant bluetooth permissions for AUTOMOTIVE SetupWizard" into... 

Merge "Add pre-grant bluetooth permissions for AUTOMOTIVE SetupWizard" into sc-qpr1-dev am: 773a974b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983244

Change-Id: Ifdcf74d748e319ad09e1460ff74a341d7095e08d
parents 49327062 773a974b

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

+8 −5
Original line number Diff line number Diff line
@@ -557,11 +557,14 @@ final class DefaultPermissionGrantPolicy { 
        grantPermissionsToSystemPackage(pm, verifier, userId, PHONE_PERMISSIONS, SMS_PERMISSIONS);



        // SetupWizard

        grantPermissionsToSystemPackage(pm,

                ArrayUtils.firstOrNull(getKnownPackages(

                        PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId)), userId,

                PHONE_PERMISSIONS, CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,

                CAMERA_PERMISSIONS);

        final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages(

                PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId));

        grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS,

                CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS);

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, 0)) {

            grantPermissionsToSystemPackage(

                    pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS);

        }



        // Camera

        grantPermissionsToSystemPackage(pm,