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

Commit 46e587ed authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Refinement of default "Nearby devices" grants." into sc-dev

parents 6192217a a5de5273

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

+2 −3
Original line number Diff line number Diff line
@@ -737,10 +737,9 @@ final class DefaultPermissionGrantPolicy { 
                grantPermissionsToSystemPackage(pm, packageName, userId,

                        CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,

                        PHONE_PERMISSIONS, SMS_PERMISSIONS, CAMERA_PERMISSIONS,

                        SENSORS_PERMISSIONS, STORAGE_PERMISSIONS);

                        SENSORS_PERMISSIONS, STORAGE_PERMISSIONS, NEARBY_DEVICES_PERMISSIONS);

                grantSystemFixedPermissionsToSystemPackage(pm, packageName, userId,

                        ALWAYS_LOCATION_PERMISSIONS, NEARBY_DEVICES_PERMISSIONS,

                        ACTIVITY_RECOGNITION_PERMISSIONS);

                        ALWAYS_LOCATION_PERMISSIONS, ACTIVITY_RECOGNITION_PERMISSIONS);

            }

        }

        if (locationExtraPackageNames != null) {