diff options
author | 2012-03-08 17:45:44 -0800 | |
---|---|---|
committer | 2012-03-08 17:45:44 -0800 | |
commit | d10a5992f90bf915a5534de24751ca40ef2919e6 (patch) | |
tree | 43cd0ded93c5fa41fe2500d10c8acfa5faea39a3 /media/libmedia/AudioSystem.cpp | |
parent | a4ef63f6c66ef7acfd7fafdf1566430677bc0a42 (diff) | |
parent | c9ab9f5c2cd1726a3b9e4176ce0504991cce2c70 (diff) |
Merge "audio policy: use audio_devices_t when appropriate"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e0b186adfde5..a1cbf0f2bd85 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -701,10 +701,10 @@ uint32_t AudioSystem::getStrategyForStream(audio_stream_type_t stream) return aps->getStrategyForStream(stream); } -uint32_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) +audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); - if (aps == 0) return 0; + if (aps == 0) return (audio_devices_t)0; return aps->getDevicesForStream(stream); } |