| commit | 512b98779c5c3e469f7e56fdb099bedda37961be | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Dec 18 18:57:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 18 18:57:27 2023 +0000 |
| tree | 16877e6f49c0ef183913669445c4e3016bbd9224 | |
| parent | cb2aa66a9ad8fb7a4297cb9ccd5275ff4832b8ae [diff] | |
| parent | 1598c5f7df6b21212c6a576427fe7f3ebe5880ef [diff] |
Merge "AudioPolicyManager:Fix CTS testGaplessMP3AudioTrackOffload fail" into main am: 55f2814b1b am: 1598c5f7df Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2780647 Change-Id: If70645068ac9a7910c413e27fa9e010a2f4a0834 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index ab3d323..58e5311 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4401,8 +4401,8 @@ if (!mAvailableOutputDevices.containsAtLeastOne(curProfile->getSupportedDevices())) { continue; } - if ((curProfile->getFlags() & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) - != AUDIO_OUTPUT_FLAG_NONE) { + if (offloadPossible && ((curProfile->getFlags() & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) + != AUDIO_OUTPUT_FLAG_NONE)) { if ((directMode & AUDIO_DIRECT_OFFLOAD_GAPLESS_SUPPORTED) != AUDIO_DIRECT_NOT_SUPPORTED) { // Already reports offload gapless supported. No need to report offload support.