commit a26ff6f22f4e86d09514c2819237bd9748455018
author Glenn Kasten <gkasten@google.com> Wed Mar 21 07:21:21 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 21 07:21:21 2012 -0700
tree e50bf0801eeb218e579448016aa69c548b1c0187
parent 903626bd3cf03920f2ca8ce8ce5cca2874d5e02d
parent a03567676e8766828ff970b87e13bc4c97b23473

Merge "new doesn't fail on Android"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index c0b18fa..8649945 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3793,16 +3793,9 @@
     if (!client->reserveTimedTrack())
         return NULL;
 
-    sp<TimedTrack> track = new TimedTrack(
+    return new TimedTrack(
         thread, client, streamType, sampleRate, format, channelMask, frameCount,
         sharedBuffer, sessionId);
-
-    if (track == NULL) {
-        client->releaseTimedTrack();
-        return NULL;
-    }
-
-    return track;
 }
 
 AudioFlinger::PlaybackThread::TimedTrack::TimedTrack(