Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am: 62749e874a

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

Change-Id: If15e595027c27dbd52c24795fa4e417fff83ca1a
This commit is contained in:
Treehugger Robot
2021-12-10 02:29:44 +00:00
committed by Automerger Merge Worker
parent 425b8699bb 62749e874a
commit d954a3dd2a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -8649,10 +8649,10 @@ package android.bluetooth {
method public android.bluetooth.BluetoothDevice getRemoteDevice(byte[]);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public int getScanMode();
method public int getState();
method public int isCisCentralSupported();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean isDiscovering();
method public boolean isEnabled();
method public boolean isLe2MPhySupported();
method public int isLeAudioSupported();
method public boolean isLeCodedPhySupported();
method public boolean isLeExtendedAdvertisingSupported();
method public boolean isLePeriodicAdvertisingSupported();

10
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -2283,21 +2283,21 @@ public final class BluetoothAdapter {
public @interface LeFeatureReturnValues {}
/**
* Returns {@link BluetoothStatusCodes#SUCCESS} if LE Connected Isochronous Stream Central
* feature is supported, returns {@link BluetoothStatusCodes#ERROR_FEATURE_NOT_SUPPORTED} if
* Returns {@link BluetoothStatusCodes#SUCCESS} if the LE audio feature is
* supported, returns {@link BluetoothStatusCodes#ERROR_FEATURE_NOT_SUPPORTED} if
* the feature is not supported or an error code.
*
* @return whether the chipset supports the LE Connected Isochronous Stream Central feature
* @return whether the LE audio is supported
*/
@RequiresNoPermission
public @LeFeatureReturnValues int isCisCentralSupported() {
public @LeFeatureReturnValues int isLeAudioSupported() {
if (!getLeAccess()) {
return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;
}
try {
mServiceLock.readLock().lock();
if (mService != null) {
return mService.isCisCentralSupported();
return mService.isLeAudioSupported();
}
} catch (RemoteException e) {
e.rethrowFromSystemServer();