diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-22 18:39:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 18:39:19 +0000 |
| commit | fb458a8894f07f9a25608a316126b9bbfb05f207 (patch) | |
| tree | 91d432787610599fafb805752c0d9ad96c4527c3 /core/java/android/bluetooth | |
| parent | f2c567e0a595370b6e0cf0a18defe47e2b247992 (diff) | |
| parent | 850eb90b0bd2a134ebf8666810f8aa1f76ca01ec (diff) | |
Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 am: bb606cfc11 am: adeef01787 am: 4d88d35930 am: 850eb90b0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444
Change-Id: Ie107709fe30d2c7aa07491eaef77ec1839eb7696
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothCodecConfig.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothCodecConfig.java b/core/java/android/bluetooth/BluetoothCodecConfig.java index d2a15357aa1f..e07bc0215a6b 100644 --- a/core/java/android/bluetooth/BluetoothCodecConfig.java +++ b/core/java/android/bluetooth/BluetoothCodecConfig.java @@ -614,8 +614,9 @@ public final class BluetoothCodecConfig implements Parcelable { if (other == null && mCodecType != other.mCodecType) { return false; } - // Currently we only care about the LDAC Playback Quality at CodecSpecific1 + // Currently we only care about the AAC VBR and LDAC Playback Quality at CodecSpecific1 switch (mCodecType) { + case SOURCE_CODEC_TYPE_AAC: case SOURCE_CODEC_TYPE_LDAC: if (mCodecSpecific1 != other.mCodecSpecific1) { return false; |