diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 21:14:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 21:14:17 +0000 |
| commit | 51beebba9d4989d05831a13bbe5cdf53ecac1bf5 (patch) | |
| tree | b2c6af1099ba3c20b8dd08d39f8dcf822303971a /media/libmedia/AudioSystem.cpp | |
| parent | b8f8d231685afdec472136b45c527a71bfb8bcc4 (diff) | |
| parent | 45faf7e02791993a487d6e038d16ff46395f1975 (diff) | |
| download | frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.zip frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.tar.gz frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.tar.bz2 | |
Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 243ea40..8542404 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -730,7 +730,7 @@ uint32_t AudioSystem::getStrategyForStream(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 (audio_devices_t)0; + if (aps == 0) return AUDIO_DEVICE_NONE; return aps->getDevicesForStream(stream); } |