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

Commit 62749e87 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 6a2f196d b897f772

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/bluetooth/BluetoothAdapter.java

+5 −5
Original line number Diff line number Diff line
@@ -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();