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

Commit 5b731a4a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unhide BluetoothProfile.LE_AUDIO and getGroupId for the App usage."... 

Merge "Unhide BluetoothProfile.LE_AUDIO and getGroupId for the App usage." into sc-dev-plus-aosp am: 89302051 am: 24b23c45

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14572662

Change-Id: I119b4a6456e77f80ca46193b761268a9fbb3ff01
parents f55648cd 24b23c45

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9429,6 +9429,7 @@ package android.bluetooth { 
    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getGroupId(@NonNull android.bluetooth.BluetoothDevice);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED = "android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED";

  }









@@ -9453,6 +9454,7 @@ package android.bluetooth {













    field @Deprecated public static final int HEALTH = 3; // 0x3















    field public static final int HEARING_AID = 21; // 0x15















    field public static final int HID_DEVICE = 19; // 0x13













    field public static final int LE_AUDIO = 22; // 0x16















    field public static final int SAP = 10; // 0xa















    field public static final int STATE_CONNECTED = 2; // 0x2















    field public static final int STATE_CONNECTING = 1; // 0x1

























core/java/android/bluetooth/BluetoothLeAudio.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -356,7 +356,6 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {













     * earbud)















     * @param device LE Audio capable device















     * @return group id that this device currently belongs to













     * @hide















     */















    @RequiresLegacyBluetoothPermission















    @RequiresBluetoothConnectPermission

































core/java/android/bluetooth/BluetoothProfile.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -208,7 +208,6 @@ public interface BluetoothProfile {













    /**















     * LE Audio Device















     *













     * @hide















     */















    int LE_AUDIO = 22;