diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-11 10:22:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 10:22:19 -0800 |
| commit | 482b9c2d3422545a0e5a83ae5cf3b30b46ae47cc (patch) | |
| tree | 3bb5dbf73b32140e7e6c07a063f0ce15ec8bffac /services/audioflinger | |
| parent | bb8d6fb4fc272ee2eb69b69e5149f81c95b79818 (diff) | |
| parent | c95ca2c26dc5ec67247caaa986fa8ead3f17890a (diff) | |
| download | frameworks_base-482b9c2d3422545a0e5a83ae5cf3b30b46ae47cc.zip frameworks_base-482b9c2d3422545a0e5a83ae5cf3b30b46ae47cc.tar.gz frameworks_base-482b9c2d3422545a0e5a83ae5cf3b30b46ae47cc.tar.bz2 | |
Merge "AudioFlinger new can't fail"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4ddefdb..9366b97 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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; @@ -3256,7 +3256,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( // written to buffer (other flags are cleared) mCblk->flags = CBLK_UNDERRUN_ON; mBufferEnd = (uint8_t *)mBuffer + bufferSize; - } } } |