diff options
| 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 |
| commit | a19ffb656616feec70613ba67ddfe15a504a4e76 (patch) | |
| tree | 4fdde29e9a31aa2ea250b4d2cf2b26bc556d3432 /media/libmedia/AudioSystem.cpp | |
| parent | 5e5631bbf2403b8242e77977792318d65362ed91 (diff) | |
| parent | 6374252107fd6539397598195ea6defd5870fafb (diff) | |
| download | frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.zip frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.tar.gz frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.tar.bz2 | |
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 e0b186a..a1cbf0f 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); } |