diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-15 18:31:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-15 18:31:48 +0000 |
| commit | dbed8955148dd2fe39584007c528e3a532f1a04e (patch) | |
| tree | 68eaa7a98f0b899f8afb52c3c74798287a69c4e1 /services/audioflinger/AudioPolicyService.cpp | |
| parent | 5b27ccd67c845aa20a12a1fb58339e7e81e3d536 (diff) | |
| parent | efa6ea97022780b68e595e5326e30dbe2a799202 (diff) | |
| download | frameworks_av-dbed8955148dd2fe39584007c528e3a532f1a04e.zip frameworks_av-dbed8955148dd2fe39584007c528e3a532f1a04e.tar.gz frameworks_av-dbed8955148dd2fe39584007c528e3a532f1a04e.tar.bz2 | |
Merge "Fix error handling in AudioSystem::getOutputForEffect"
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index c8f0730..415f696 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -475,8 +475,9 @@ audio_devices_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stre audio_io_handle_t AudioPolicyService::getOutputForEffect(const effect_descriptor_t *desc) { + // FIXME change return type to status_t, and return NO_INIT here if (mpAudioPolicy == NULL) { - return NO_INIT; + return 0; } Mutex::Autolock _l(mLock); return mpAudioPolicy->get_output_for_effect(mpAudioPolicy, desc); |