Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 482b9c2d authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger new can't fail"

parents bb8d6fb4 c95ca2c2

services/audioflinger/AudioFlinger.cpp

+1 −2
Original line number Diff line number Diff line
@@ -3243,7 +3243,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
        }

   } else {

       mCblk = (audio_track_cblk_t *)(new uint8_t[size]);

       if (mCblk) { // construct the shared structure in-place.

           // construct the shared structure in-place.

           new(mCblk) audio_track_cblk_t();

           // clear all buffers

           mCblk->frameCount = frameCount;
@@ -3258,7 +3258,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( 
           mBufferEnd = (uint8_t *)mBuffer + bufferSize;

   }

}

}



AudioFlinger::ThreadBase::TrackBase::~TrackBase()

{