commit e198f26cae6f0b5c67340935c291363fdfff87f1
author Eric Laurent <elaurent@google.com> Sat Nov 04 00:13:42 2017 +0000
committer Eric Laurent <elaurent@google.com> Sat Nov 04 00:13:42 2017 +0000
tree a08455486befa3d1ed0ebd6d3eb8257f51dcfb7d
parent e1dd2075105317ef8ff2b924423c88856e8fe8ea

Revert "audio policy: refactor getOutput() method"

This reverts commit e1dd2075105317ef8ff2b924423c88856e8fe8ea.

Change-Id: I4b7a2177af5bff5013ec4fe7fcdeb722f6b158c5

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 58330ae..cdc75ac 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -822,11 +822,16 @@
 }
 
 
-audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream)
+audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream,
+                                    uint32_t samplingRate,
+                                    audio_format_t format,
+                                    audio_channel_mask_t channelMask,
+                                    audio_output_flags_t flags,
+                                    const audio_offload_info_t *offloadInfo)
 {
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
     if (aps == 0) return 0;
-    return aps->getOutput(stream);
+    return aps->getOutput(stream, samplingRate, format, channelMask, flags, offloadInfo);
 }
 
 status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr,