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

Commit cb04069a authored by Rodrigo Lagos's avatar Rodrigo Lagos Committed by Android (Google) Code Review
Browse files

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

parents c37e0e46 d0636e18

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

+4 −2
Original line number Diff line number Diff line
@@ -561,7 +561,9 @@ final class DefaultPermissionGrantPolicy { 
                PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId));

        grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS,

                CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS);

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

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0)

                || mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE,

                0)) {

            grantPermissionsToSystemPackage(

                    pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS);

        }