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

Commit 84e3f271 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Throw exception when LE state is on, but bluetooth service is null."... 

Merge "Throw exception when LE state is on, but bluetooth service is null." am: 4a680b91 am: 835b73ad am: 29b1dbad

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2003692

Change-Id: I96894ea704c5d63734d8490d846c8748d8770bd1
parents 39f9de0b 29b1dbad

framework/java/android/bluetooth/BluetoothAdapter.java

+12 −0
Original line number Diff line number Diff line
@@ -2464,6 +2464,7 @@ public final class BluetoothAdapter { 
     * supported, or an error code.

     *

     * @return whether the LE audio is supported

     * @throws IllegalStateException if the bluetooth service is null

     */

    @RequiresNoPermission

    public @LeFeatureReturnValues int isLeAudioSupported() {
@@ -2477,6 +2478,9 @@ public final class BluetoothAdapter { 
                mService.isLeAudioSupported(recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout())

                    .getValue(BluetoothStatusCodes.ERROR_UNKNOWN);

            } else {

                throw new IllegalStateException(

                        "LE state is on, but there is no bluetooth service.");

            }

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
@@ -2494,6 +2498,7 @@ public final class BluetoothAdapter { 
     * is not supported, or an error code.

     *

     * @return whether the LE audio broadcast source is supported

     * @throws IllegalStateException if the bluetooth service is null

     */

    @RequiresNoPermission

    public @LeFeatureReturnValues int isLeAudioBroadcastSourceSupported() {
@@ -2507,6 +2512,9 @@ public final class BluetoothAdapter { 
                mService.isLeAudioBroadcastSourceSupported(recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout())

                    .getValue(BluetoothStatusCodes.ERROR_UNKNOWN);

            } else {

                throw new IllegalStateException(

                        "LE state is on, but there is no bluetooth service.");

            }

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
@@ -2525,6 +2533,7 @@ public final class BluetoothAdapter { 
     * not supported, or an error code.

     *

     * @return whether the LE audio broadcast assistent is supported

     * @throws IllegalStateException if the bluetooth service is null

     */

    @RequiresNoPermission

    public @LeFeatureReturnValues int isLeAudioBroadcastAssistantSupported() {
@@ -2538,6 +2547,9 @@ public final class BluetoothAdapter { 
                mService.isLeAudioBroadcastAssistantSupported(recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout())

                    .getValue(BluetoothStatusCodes.ERROR_UNKNOWN);

            } else {

                throw new IllegalStateException(

                        "LE state is on, but there is no bluetooth service.");

            }

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));