diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-07 16:16:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-07 16:16:06 +0000 |
| commit | fee4ce338d78eeb58af1f66831ead53322d3859e (patch) | |
| tree | f90931a7c5c4628b0e8e47976d68a9d586802b53 /media/libmedia/IAudioFlinger.cpp | |
| parent | ea0fadeb5d81ef3cb7f9db458c9033d628bdb86a (diff) | |
| parent | e93cf2ca27ae6f4a81d4ef548bbf10a34db6d98f (diff) | |
| download | frameworks_av-fee4ce338d78eeb58af1f66831ead53322d3859e.zip frameworks_av-fee4ce338d78eeb58af1f66831ead53322d3859e.tar.gz frameworks_av-fee4ce338d78eeb58af1f66831ead53322d3859e.tar.bz2 | |
Merge "Cleanup openRecord error handling" into klp-dev
Diffstat (limited to 'media/libmedia/IAudioFlinger.cpp')
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 68928f1..448a82e 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -184,6 +184,17 @@ public: } lStatus = reply.readInt32(); record = interface_cast<IAudioRecord>(reply.readStrongBinder()); + if (lStatus == NO_ERROR) { + if (record == 0) { + ALOGE("openRecord should have returned an IAudioRecord"); + lStatus = UNKNOWN_ERROR; + } + } else { + if (record != 0) { + ALOGE("openRecord returned an IAudioRecord but with status %d", lStatus); + record.clear(); + } + } } if (status) { *status = lStatus; @@ -784,6 +795,7 @@ status_t BnAudioFlinger::onTransact( status_t status; sp<IAudioRecord> record = openRecord(input, sampleRate, format, channelMask, frameCount, &flags, tid, &sessionId, &status); + LOG_ALWAYS_FATAL_IF((record != 0) != (status == NO_ERROR)); reply->writeInt32(flags); reply->writeInt32(sessionId); reply->writeInt32(status); |