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

Commit d42a883b authored by Alex Li's avatar Alex Li Committed by Android (Google) Code Review
Browse files

Merge "Pregrant the nearby device permisison for SetupWizard." into tm-dev

parents 0e0fd1d8 8df23b2b

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

+2 −7
Original line number Diff line number Diff line
@@ -603,15 +603,10 @@ final class DefaultPermissionGrantPolicy { 
        final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages(

                KnownPackages.PACKAGE_SETUP_WIZARD, userId));

        grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS,

                CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS);

                CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS,

                NEARBY_DEVICES_PERMISSIONS);

        grantSystemFixedPermissionsToSystemPackage(pm, setupWizardPackage, userId,

                NOTIFICATION_PERMISSIONS);

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

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

                0)) {

            grantPermissionsToSystemPackage(

                    pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS);

        }



        // SearchSelector

        grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId,