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

Commit 0deb47fd authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Add BT scan/advertise and uwb ranging permission to connectedDevice FGS"

parents ddec7b1f c43a6984

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12709,7 +12709,7 @@ package android.content.pm { 
    field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1

    field public static final int FLAG_USE_APP_ZYGOTE = 8; // 0x8

    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CAMERA}, anyOf={android.Manifest.permission.CAMERA}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CAMERA = 64; // 0x40

    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10

    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR, android.Manifest.permission.UWB_RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10

    field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1; // 0x1

    field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT) public static final int FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT = 4096; // 0x1000

    field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100

core/java/android/app/ForegroundServiceTypePolicy.java

+3 −0
Original line number Diff line number Diff line
@@ -259,12 +259,15 @@ public abstract class ForegroundServiceTypePolicy { 
                new RegularPermission(Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE)

            }, true),

            new ForegroundServiceTypePermissions(new ForegroundServiceTypePermission[] {

                new RegularPermission(Manifest.permission.BLUETOOTH_ADVERTISE),

                new RegularPermission(Manifest.permission.BLUETOOTH_CONNECT),

                new RegularPermission(Manifest.permission.BLUETOOTH_SCAN),

                new RegularPermission(Manifest.permission.CHANGE_NETWORK_STATE),

                new RegularPermission(Manifest.permission.CHANGE_WIFI_STATE),

                new RegularPermission(Manifest.permission.CHANGE_WIFI_MULTICAST_STATE),

                new RegularPermission(Manifest.permission.NFC),

                new RegularPermission(Manifest.permission.TRANSMIT_IR),

                new RegularPermission(Manifest.permission.UWB_RANGING),

                new UsbDevicePermission(),

                new UsbAccessoryPermission(),

            }, false)

core/java/android/content/pm/ServiceInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -214,12 +214,15 @@ public class ServiceInfo extends ComponentInfo 
     * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and later, will require permission

     * {@link android.Manifest.permission#FOREGROUND_SERVICE_CONNECTED_DEVICE} and one of the

     * following permissions:

     * {@link android.Manifest.permission#BLUETOOTH_ADVERTISE},

     * {@link android.Manifest.permission#BLUETOOTH_CONNECT},

     * {@link android.Manifest.permission#BLUETOOTH_SCAN},

     * {@link android.Manifest.permission#CHANGE_NETWORK_STATE},

     * {@link android.Manifest.permission#CHANGE_WIFI_STATE},

     * {@link android.Manifest.permission#CHANGE_WIFI_MULTICAST_STATE},

     * {@link android.Manifest.permission#NFC},

     * {@link android.Manifest.permission#TRANSMIT_IR},

     * {@link android.Manifest.permission#UWB_RANGING},

     * or has been granted the access to one of the attached USB devices/accessories.

     */

    @RequiresPermission(
@@ -227,12 +230,15 @@ public class ServiceInfo extends ComponentInfo 
                Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE,

            },

            anyOf = {

                Manifest.permission.BLUETOOTH_ADVERTISE,

                Manifest.permission.BLUETOOTH_CONNECT,

                Manifest.permission.BLUETOOTH_SCAN,

                Manifest.permission.CHANGE_NETWORK_STATE,

                Manifest.permission.CHANGE_WIFI_STATE,

                Manifest.permission.CHANGE_WIFI_MULTICAST_STATE,

                Manifest.permission.NFC,

                Manifest.permission.TRANSMIT_IR,

                Manifest.permission.UWB_RANGING,

            },

            conditional = true

    )