From f380677f21240ffb78bcdf7c804fe0a7807fb08d Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Tue, 7 Oct 2014 09:19:31 -0700
Subject: audio policy: fix build with USE_LEGACY_AUDIO_POLICY

Bug: 17894512.
Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa
---
 services/audiopolicy/AudioPolicyClientImplLegacy.cpp    | 2 +-
 services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'services')

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 @@ static audio_io_handle_t open_output(audio_module_handle_t module,
         *pFormat = config.format;
         *pChannelMask = config.channel_mask;
         if (offloadInfo != NULL) {
-            *offloadInfo = config.offload_info;
+            *((audio_offload_info_t *)offloadInfo) = config.offload_info;
         }
     }
     return output;
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 @@ status_t AudioPolicyService::setAudioPortConfig(const struct audio_port_config *
     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,
-- 
cgit v1.1