Skip to content

Commit 85b51b8

Browse files
gkastenAndroid (Google) Code Review
authored andcommitted
Merge "new doesn't fail on Android"
2 parents a6c4d8e + 44c71fa commit 85b51b8

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

services/audioflinger/AudioFlinger.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3793,16 +3793,9 @@ AudioFlinger::PlaybackThread::TimedTrack::create(
37933793
if (!client->reserveTimedTrack())
37943794
return NULL;
37953795

3796-
sp<TimedTrack> track = new TimedTrack(
3796+
return new TimedTrack(
37973797
thread, client, streamType, sampleRate, format, channelMask, frameCount,
37983798
sharedBuffer, sessionId);
3799-
3800-
if (track == NULL) {
3801-
client->releaseTimedTrack();
3802-
return NULL;
3803-
}
3804-
3805-
return track;
38063799
}
38073800

38083801
AudioFlinger::PlaybackThread::TimedTrack::TimedTrack(

0 commit comments

Comments
 (0)