diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-14 23:22:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-14 23:22:50 +0000 |
| commit | 3147fafa46fbf80b652d997b2a5d5e4d487f601c (patch) | |
| tree | 42c5d7a6f517b0cf7d4110dab29eb63137d01ebc /framework/java | |
| parent | 9db075d3f21bba3b66350d3041f3e7517674fced (diff) | |
| parent | a6a4472ba7963bb0fe379d93c61660cd9e4dc9c6 (diff) | |
Merge "broadcaster: Add missing null checks at client side"
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothLeBroadcast.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcast.java b/framework/java/android/bluetooth/BluetoothLeBroadcast.java index 72eaf437ef..3cdf2cd129 100644 --- a/framework/java/android/bluetooth/BluetoothLeBroadcast.java +++ b/framework/java/android/bluetooth/BluetoothLeBroadcast.java @@ -542,8 +542,8 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi * * @param contentMetadata metadata for the default Broadcast subgroup * @param broadcastCode Encryption will be enabled when <var>broadcastCode</var> is not null - * @throws IllegalArgumentException if <var>contentMetadata</var> is null * @throws IllegalStateException if callback was not registered + * @throws NullPointerException if <var>contentMetadata</var> is null * @hide */ @SystemApi @@ -554,6 +554,8 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi }) public void startBroadcast(@NonNull BluetoothLeAudioContentMetadata contentMetadata, @Nullable byte[] broadcastCode) { + Objects.requireNonNull(contentMetadata, "contentMetadata cannot be null"); + if (DBG) log("startBroadcasting"); final IBluetoothLeAudio service = getService(); if (service == null) { @@ -579,6 +581,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi * @param broadcastId broadcastId as defined by the Basic Audio Profile * @param contentMetadata updated metadata for the default Broadcast subgroup * @throws IllegalStateException if callback was not registered + * @throws NullPointerException if <var>contentMetadata</var> is null * @hide */ @SystemApi @@ -589,6 +592,8 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi }) public void updateBroadcast(int broadcastId, @NonNull BluetoothLeAudioContentMetadata contentMetadata) { + Objects.requireNonNull(contentMetadata, "contentMetadata cannot be null"); + if (DBG) log("updateBroadcast"); final IBluetoothLeAudio service = getService(); if (service == null) { |