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 /services/audioflinger/AudioFlinger.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 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 7aee74a..853ff07 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1562,7 +1562,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, ALOGV("openOutput(), offloadInfo %p version 0x%04x", offloadInfo, offloadInfo == NULL ? -1 : offloadInfo->version); - if (pDevices == NULL || *pDevices == 0) { + if (pDevices == NULL || *pDevices == AUDIO_DEVICE_NONE) { return 0; } @@ -1776,7 +1776,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, audio_format_t reqFormat = config.format; audio_channel_mask_t reqChannelMask = config.channel_mask; - if (pDevices == NULL || *pDevices == 0) { + if (pDevices == NULL || *pDevices == AUDIO_DEVICE_NONE) { return 0; } |