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

Commit d44eb0f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add bg location access for companiondevicemanager"

parents 07b765f0 5eda9dd0

packages/CompanionDeviceManager/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
    <uses-permission android:name="android.permission.BLUETOOTH"/>

    <uses-permission android:name="android.permission.BLUETOOTH"/>

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -143,6 +143,13 @@ public final class DefaultPermissionGrantPolicy { 
        LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION);

        LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION);

    }

    }





    private static final Set<String> ALWAYS_LOCATION_PERMISSIONS = new ArraySet<>();

    static {

        ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION);

        ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION);

        ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION);

    }



    private static final Set<String> ACTIVITY_RECOGNITION_PERMISSIONS = new ArraySet<>();

    private static final Set<String> ACTIVITY_RECOGNITION_PERMISSIONS = new ArraySet<>();

    static {

    static {

        ACTIVITY_RECOGNITION_PERMISSIONS.add(Manifest.permission.ACTIVITY_RECOGNITION);

        ACTIVITY_RECOGNITION_PERMISSIONS.add(Manifest.permission.ACTIVITY_RECOGNITION);
@@ -690,7 +697,7 @@ public final class DefaultPermissionGrantPolicy { 
        // Companion devices

        // Companion devices

        grantSystemFixedPermissionsToSystemPackage(

        grantSystemFixedPermissionsToSystemPackage(

                CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME, userId,

                CompanionDeviceManager.COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME, userId,

                LOCATION_PERMISSIONS);

                ALWAYS_LOCATION_PERMISSIONS);





        // Ringtone Picker

        // Ringtone Picker

        grantSystemFixedPermissionsToSystemPackage(

        grantSystemFixedPermissionsToSystemPackage(