diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-17 19:15:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-17 19:15:57 +0000 |
| commit | 0ce5ca5e113d58cbcb7cb48615d6dbbf3fbe7c66 (patch) | |
| tree | b5f59ae15e5f5ea59a171f7677e2a8403361f80a /media/libmedia/IAudioFlinger.cpp | |
| parent | d0b33f63a9364364a827e77da26b112edf3c4d6e (diff) | |
| parent | 0cde076ddb283c84c3801a2df4cc3df99bd1577f (diff) | |
| download | frameworks_av-0ce5ca5e113d58cbcb7cb48615d6dbbf3fbe7c66.zip frameworks_av-0ce5ca5e113d58cbcb7cb48615d6dbbf3fbe7c66.tar.gz frameworks_av-0ce5ca5e113d58cbcb7cb48615d6dbbf3fbe7c66.tar.bz2 | |
Merge "Cleanup createTrack error handling"
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 3aaff88..86a4d74 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -138,6 +138,17 @@ public: name = reply.readString8(); lStatus = reply.readInt32(); track = interface_cast<IAudioTrack>(reply.readStrongBinder()); + if (lStatus == NO_ERROR) { + if (track == 0) { + ALOGE("createTrack should have returned an IAudioTrack"); + lStatus = UNKNOWN_ERROR; + } + } else { + if (track != 0) { + ALOGE("createTrack returned an IAudioTrack but with status %d", lStatus); + track.clear(); + } + } } if (status != NULL) { *status = lStatus; @@ -798,6 +809,7 @@ status_t BnAudioFlinger::onTransact( (audio_stream_type_t) streamType, sampleRate, format, channelMask, frameCount, &flags, buffer, output, tid, &sessionId, name, clientUid, &status); + LOG_ALWAYS_FATAL_IF((track != 0) != (status == NO_ERROR)); } reply->writeInt32(flags); reply->writeInt32(sessionId); |