| commit | d1f7ed2386b00dd80587846a47c44a708e582dcd | [log] [tgz] |
|---|---|---|
| author | Antoine Soulier <asoulier@google.com> | Thu Feb 27 10:49:33 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 27 10:49:33 2025 -0800 |
| tree | e57a931d5085060cef7393c1dda1ae6884ae0057 | |
| parent | c8649928c823cb7d21a114985f98430ae13a6bb7 [diff] | |
| parent | 5637e2b58eb8906d043d149122e3578e1477badd [diff] |
Merge "BT: Correct SBC Bit-pool calculation logic" into main am: 5637e2b58e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3509411 Change-Id: I591541ba49225b2cf0a0fe6a70d3dec9b0b91eb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/audio/aidl/default/A2dpOffloadCodecSbc.cpp b/bluetooth/audio/aidl/default/A2dpOffloadCodecSbc.cpp index 6b9046c..910f8c3 100644 --- a/bluetooth/audio/aidl/default/A2dpOffloadCodecSbc.cpp +++ b/bluetooth/audio/aidl/default/A2dpOffloadCodecSbc.cpp
@@ -486,7 +486,7 @@ } min_bitpool = std::max(min_bitpool, uint8_t(lcaps.get(kMinimumBitpool))); - max_bitpool = std::max(max_bitpool, uint8_t(lcaps.get(kMaximumBitpool))); + max_bitpool = std::min(max_bitpool, uint8_t(lcaps.get(kMaximumBitpool))); if (hint) { min_bitpool =