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

Commit 8df23b2b authored by alexylli's avatar alexylli
Browse files

Pregrant the nearby device permisison for SetupWizard. 

Bug: 231400126
Test: manual
Change-Id: I36f38bf2565eb25dbe52d490ff1a18bc2d396cf3
parent ac3033fd

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

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

        final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages(

                KnownPackages.PACKAGE_SETUP_WIZARD, userId));

                KnownPackages.PACKAGE_SETUP_WIZARD, userId));

        grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS,

        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,

        grantSystemFixedPermissionsToSystemPackage(pm, setupWizardPackage, userId,

                NOTIFICATION_PERMISSIONS);

                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

        // SearchSelector

        grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId,

        grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId,