Merge "Change isCISCentralSupported() to isLeAudioSupported() API"

This commit is contained in:
Treehugger Robot
2021-12-10 02:10:42 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 6 deletions

View File

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

View File

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