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

Commit 82e8f647 authored by Patty's avatar Patty
Browse files

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

Tag: #refactor
Bug: 216528836
Test: atest BluetoothInstrumentationTests
Change-Id: Id61478f81b74bc3398d71e1fe8a410058ab05142
parent cc09855f

framework/java/android/bluetooth/BluetoothAdapter.java

+12 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,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() {
@@ -2471,6 +2472,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()));
@@ -2488,6 +2492,7 @@ public final class BluetoothAdapter { 
     * feature 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() {
@@ -2501,6 +2506,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()));
@@ -2519,6 +2527,7 @@ public final class BluetoothAdapter { 
     * feature is 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() {
@@ -2532,6 +2541,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()));