diff options
author | Jack He <siyuanh@google.com> | 2022-04-24 19:02:37 -0700 |
---|---|---|
committer | Jack He <siyuanh@google.com> | 2022-04-28 01:28:14 +0000 |
commit | 771724d4575abe529b6bd1a071e3289f14d3d77a (patch) | |
tree | 4f3fd5cb599be1eb0984988d399f949596e9b299 /framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java | |
parent | 376819760a772a3fdf299811aad92988db6c1f8a (diff) |
BASS: Fix BASS client service to pass CTS tests
* Through NullPointerException when asserting on non-null arguments
* Invoke error callback when sink device is not connected
* Assert on parameter value at binder client side
* Clear binder identity when checking DeviceConfig values
Test: atest CtsBluetoothTestCases
Bug: 229790402
Fixes: 229790402
Ignore-AOSP-First: Fixing CTS tests on T
Change-Id: Ie19cf24d2fe20948494643f3ce179d1a2c3a290f
Merged-In: Ie19cf24d2fe20948494643f3ce179d1a2c3a290f
(cherry picked from commit 9d0518ee6515bf0aeccdbd428485e7bd38f68f0b)
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java')
-rw-r--r-- | framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java b/framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java index b2abe06551..38a747b5d5 100644 --- a/framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java +++ b/framework/java/android/bluetooth/BluetoothLeBroadcastSubgroup.java @@ -17,6 +17,7 @@ package android.bluetooth; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -48,6 +49,23 @@ public final class BluetoothLeBroadcastSubgroup implements Parcelable { mChannels = channels; } + @Override + public boolean equals(@Nullable Object o) { + if (!(o instanceof BluetoothLeBroadcastSubgroup)) { + return false; + } + final BluetoothLeBroadcastSubgroup other = (BluetoothLeBroadcastSubgroup) o; + return mCodecId == other.getCodecId() + && mCodecSpecificConfig.equals(other.getCodecSpecificConfig()) + && mContentMetadata.equals(other.getContentMetadata()) + && mChannels.equals(other.getChannels()); + } + + @Override + public int hashCode() { + return Objects.hash(mCodecId, mCodecSpecificConfig, mContentMetadata, mChannels); + } + /** * Get the codec ID field as defined by the Basic Audio Profile. * |