summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioPolicyService.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-02-03 08:31:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-03 08:31:01 -0800
commit787bae0578fbaab6219ebf23494866b224d01438 (patch)
tree935422276579d6f7c3b4e835e1a79bc9082a2b26 /services/audioflinger/AudioPolicyService.cpp
parentff3c83e04ae459c4252b86dd4440b4e37ee92c16 (diff)
parentde9719b3ec71472e6bf75117152176af51d1a515 (diff)
downloadframeworks_av-787bae0578fbaab6219ebf23494866b224d01438.zip
frameworks_av-787bae0578fbaab6219ebf23494866b224d01438.tar.gz
frameworks_av-787bae0578fbaab6219ebf23494866b224d01438.tar.bz2
Merge "Use audio_in_acoustics_t consistently"
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
-rw-r--r--services/audioflinger/AudioPolicyService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp
index 0f2f544..1dddbb3 100644
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/services/audioflinger/AudioPolicyService.cpp
@@ -1419,7 +1419,7 @@ static audio_io_handle_t aps_open_input(void *service,
uint32_t *pSamplingRate,
audio_format_t *pFormat,
uint32_t *pChannels,
- uint32_t acoustics)
+ audio_in_acoustics_t acoustics)
{
sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
if (af == NULL) {