Merge changes from topic "ble-broadcast-api-feedback"

* changes:
  Broadcast API adjustment
  CSIP: Use verb first grammar for lock and unlock group API

1 files changed, 3 insertions, 0 deletions

diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcastChannel.java b/framework/java/android/bluetooth/BluetoothLeBroadcastChannel.java
index 6addc062e3..676692ae4a 100644
--- a/framework/java/android/bluetooth/BluetoothLeBroadcastChannel.java
+++ b/framework/java/android/bluetooth/BluetoothLeBroadcastChannel.java
@@ -200,6 +200,9 @@ public final class BluetoothLeBroadcastChannel implements Parcelable {
          */
         @SystemApi
         public @NonNull BluetoothLeBroadcastChannel build() {
+            if (mCodecMetadata == null) {
+                throw new IllegalArgumentException("codec metadata cannot be null");
+            }
             return new BluetoothLeBroadcastChannel(mIsSelected, mChannelIndex, mCodecMetadata);
         }
     }