diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-03 02:53:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-03 02:53:26 +0000 |
| commit | 29b1dbad795e2494e5ab333cf725206c2995ba2c (patch) | |
| tree | 7eab5690d6bf0cc48e3fc7597e75553a751d3f02 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 3b4ddfbaf06a6e0757ef5e243a6db9e698942db5 (diff) | |
| parent | 835b73ada953ad6ce647ee782eaf7f4d91757b02 (diff) | |
Merge "Throw exception when LE state is on, but bluetooth service is null." am: 4a680b9117 am: 835b73ada9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2003692
Change-Id: I39c45b58ce30a8f12914c34b45e9efc87fbbe547
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index b0fb0093af..2fef4302cf 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -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())); |