Merge "Unhide BluetoothProfile.LE_AUDIO and getGroupId for the App usage." into sc-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
893020512f
@@ -9429,6 +9429,7 @@ package android.bluetooth {
|
|||||||
method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
|
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 @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 @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";
|
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 @Deprecated public static final int HEALTH = 3; // 0x3
|
||||||
field public static final int HEARING_AID = 21; // 0x15
|
field public static final int HEARING_AID = 21; // 0x15
|
||||||
field public static final int HID_DEVICE = 19; // 0x13
|
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 SAP = 10; // 0xa
|
||||||
field public static final int STATE_CONNECTED = 2; // 0x2
|
field public static final int STATE_CONNECTED = 2; // 0x2
|
||||||
field public static final int STATE_CONNECTING = 1; // 0x1
|
field public static final int STATE_CONNECTING = 1; // 0x1
|
||||||
|
|||||||
@@ -356,7 +356,6 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable {
|
|||||||
* earbud)
|
* earbud)
|
||||||
* @param device LE Audio capable device
|
* @param device LE Audio capable device
|
||||||
* @return group id that this device currently belongs to
|
* @return group id that this device currently belongs to
|
||||||
* @hide
|
|
||||||
*/
|
*/
|
||||||
@RequiresLegacyBluetoothPermission
|
@RequiresLegacyBluetoothPermission
|
||||||
@RequiresBluetoothConnectPermission
|
@RequiresBluetoothConnectPermission
|
||||||
|
|||||||
@@ -208,7 +208,6 @@ public interface BluetoothProfile {
|
|||||||
/**
|
/**
|
||||||
* LE Audio Device
|
* LE Audio Device
|
||||||
*
|
*
|
||||||
* @hide
|
|
||||||
*/
|
*/
|
||||||
int LE_AUDIO = 22;
|
int LE_AUDIO = 22;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user