Merge "Fix cts fail AudioTrackTest#testPlaybackHeadPositionIncrease" am: ac89ed720c am: a053abe04b
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2608657
Change-Id: I88e73f55329e52699cfa766fcba2a030e6ad0ea4
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 daafd28..028c9a0 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1088,7 +1088,12 @@
// and AudioSystem::getOutputSamplingRate().
SortedVector<audio_io_handle_t> outputs = getOutputsForDevices(devices, mOutputs);
- const audio_io_handle_t output = selectOutput(outputs);
+ audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
+ if (stream == AUDIO_STREAM_MUSIC &&
+ property_get_bool("audio.deep_buffer.media", false /* default_value */)) {
+ flags = AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
+ }
+ const audio_io_handle_t output = selectOutput(outputs, flags);
ALOGV("getOutput() stream %d selected devices %s, output %d", stream,
devices.toString().c_str(), output);