commit c08d20b6a37122ebf116262c9372509ed060d4c1
author Glenn Kasten <gkasten@google.com> Mon Feb 24 15:21:10 2014 -0800
committer Glenn Kasten <gkasten@google.com> Tue Feb 25 15:20:49 2014 -0800
tree ea9f9586612094d800e2a3498f0b9b4573f609ad
parent 045e739161f5ae00321a6cfba20935abb791005b

Simplify error handling after track creation

IAudioFlinger::createTrack and IAudioFlinger::openRecord
both guarantee that (status == OK) == (sp<> != 0).

Change-Id: I91cb4f7e843019efb65cace7ba146f7da7aa5b59

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index eed7a0b..adf3847 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1016,10 +1016,12 @@
                                                       mClientUid,
                                                       &status);
 
-    if (track == 0) {
+    if (status != NO_ERROR) {
         ALOGE("AudioFlinger could not create track, status: %d", status);
         goto release;
     }
+    ALOG_ASSERT(track != 0);
+
     // AudioFlinger now owns the reference to the I/O handle,
     // so we are no longer responsible for releasing it.