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

Commit ce4c94a2 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." am: f20d5d97 

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

Change-Id: Ieac08c26b8309322e0fcf4fcc1e49b5201b39ccf
parents bb7dc51b f20d5d97

core/api/current.txt

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

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

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

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

    field public static final String ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED = "android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED";

  }









@@ -9089,6 +9090,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








@@ -335,7 +335,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















     */















    @RequiresPermission(Manifest.permission.BLUETOOTH)















    public int getGroupId(@NonNull BluetoothDevice device) {

































core/java/android/bluetooth/BluetoothProfile.java



+0
−1




























Original line number
Diff line number
Diff line








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













    /**















     * LE Audio Device















     *













     * @hide















     */















    int LE_AUDIO = 22;