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 /media/libmedia/AudioSystem.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 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 4580030..69d9273 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -735,7 +735,8 @@ audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) audio_io_handle_t AudioSystem::getOutputForEffect(const effect_descriptor_t *desc) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); - if (aps == 0) return PERMISSION_DENIED; + // FIXME change return type to status_t, and return PERMISSION_DENIED here + if (aps == 0) return 0; return aps->getOutputForEffect(desc); } |