summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2012-03-21 07:21:21 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-21 07:21:21 -0700
commit85b51b8ae39a4aa3181d92e171baa86437475c0c (patch)
tree933fb6d942c244e6d0b4638ee891d302d351deec
parenta6c4d8e018e39ff94263ce8f2a31b768104d1bb6 (diff)
parent44c71fa11a9380d2c4a9eab69272b2e25b672af4 (diff)
Merge "new doesn't fail on Android"
-rw-r--r--services/audioflinger/AudioFlinger.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index c0b18fa03ab1..8649945fd274 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3793,16 +3793,9 @@ AudioFlinger::PlaybackThread::TimedTrack::create(
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(