summaryrefslogtreecommitdiff
path: root/services/audioflinger/AudioPolicyService.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2012-03-08 17:45:44 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-08 17:45:44 -0800
commitd10a5992f90bf915a5534de24751ca40ef2919e6 (patch)
tree43cd0ded93c5fa41fe2500d10c8acfa5faea39a3 /services/audioflinger/AudioPolicyService.cpp
parenta4ef63f6c66ef7acfd7fafdf1566430677bc0a42 (diff)
parentc9ab9f5c2cd1726a3b9e4176ce0504991cce2c70 (diff)
Merge "audio policy: use audio_devices_t when appropriate"
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
-rw-r--r--services/audioflinger/AudioPolicyService.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp
index 753b1d248323..62768bf4fcd8 100644
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/services/audioflinger/AudioPolicyService.cpp
@@ -432,10 +432,12 @@ uint32_t AudioPolicyService::getStrategyForStream(audio_stream_type_t stream)
return mpAudioPolicy->get_strategy_for_stream(mpAudioPolicy, stream);
}
-uint32_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stream)
+//audio policy: use audio_device_t appropriately
+
+audio_devices_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stream)
{
if (mpAudioPolicy == NULL) {
- return 0;
+ return (audio_devices_t)0;
}
return mpAudioPolicy->get_devices_for_stream(mpAudioPolicy, stream);
}