commit f380677f21240ffb78bcdf7c804fe0a7807fb08d
author Eric Laurent <elaurent@google.com> Tue Oct 07 09:19:31 2014 -0700
committer Eric Laurent <elaurent@google.com> Tue Oct 07 12:25:01 2014 -0700
tree 9116f900580b1926e511970340ca97a7e717811a
parent 8b1e80bf1e9f214feea219cfe981ba533b806003

audio policy: fix build with USE_LEGACY_AUDIO_POLICY

Bug: 17894512.
Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa

services/audiopolicy/AudioPolicyClientImplLegacy.cpp

diff --git a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
index 9639096..97719da 100644
--- a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
+++ b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
@@ -96,7 +96,7 @@
         *pFormat = config.format;
         *pChannelMask = config.channel_mask;
         if (offloadInfo != NULL) {
-            *offloadInfo = config.offload_info;
+            *((audio_offload_info_t *)offloadInfo) = config.offload_info;
         }
     }
     return output;

services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp

diff --git a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
index 9f66fd1..e1e81e1 100644
--- a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
+++ b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
@@ -24,6 +24,7 @@
 #include <system/audio.h>
 #include <system/audio_policy.h>
 #include <hardware/audio_policy.h>
+#include <media/AudioPolicyHelper.h>
 
 namespace android {
 
@@ -525,7 +526,7 @@
     return INVALID_OPERATION;
 }
 
-audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr __unused,
+audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr,
                                     uint32_t samplingRate,
                                     audio_format_t format,
                                     audio_channel_mask_t channelMask,