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 | 9770988e61961d34033fd2c12f0de85a267df68f (patch) | |
tree | 80cc52b55695c1f147b06d5318ee4cd6d61b8467 /services | |
parent | 02b2d2dddc9be339cf7647d4ead53cecd1c51038 (diff) | |
parent | 4a6f02833d8421b7d9b20f89729d8bb03b8b8102 (diff) | |
download | frameworks_av-9770988e61961d34033fd2c12f0de85a267df68f.zip frameworks_av-9770988e61961d34033fd2c12f0de85a267df68f.tar.gz frameworks_av-9770988e61961d34033fd2c12f0de85a267df68f.tar.bz2 |
Merge "AudioFlinger new can't fail"
Diffstat (limited to 'services')
-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; - } } } |