diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-04 12:38:13 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-11 12:27:41 -0800 |
| commit | 83bc7f3cf78b28a818417f40a4f0c00593993366 (patch) | |
| tree | 92870fd797bc4cc281c60e463848e27e7f16b1ea /media/libmedia/ToneGenerator.cpp | |
| parent | 3bba0e0a60b15895134bc2c731d21fd7ebd28784 (diff) | |
| download | frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.zip frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.tar.gz frameworks_av-83bc7f3cf78b28a818417f40a4f0c00593993366.tar.bz2 | |
libmedia new can't fail on Android
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
Diffstat (limited to 'media/libmedia/ToneGenerator.cpp')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 35dfbb8..9d32460 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -1017,10 +1017,6 @@ bool ToneGenerator::initAudioTrack() { // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size mpAudioTrack = new AudioTrack(); - if (mpAudioTrack == 0) { - ALOGE("AudioTrack allocation failed"); - goto initAudioTrack_exit; - } ALOGV("Create Track: %p\n", mpAudioTrack); mpAudioTrack->set(mStreamType, @@ -1353,9 +1349,6 @@ bool ToneGenerator::prepareWave() { new ToneGenerator::WaveGenerator((unsigned short)mSamplingRate, frequency, TONEGEN_GAIN/lNumWaves); - if (lpWaveGen == 0) { - goto prepareWave_exit; - } mWaveGens.add(frequency, lpWaveGen); } frequency = mpNewToneDesc->segments[segmentIdx].waveFreq[++freqIdx]; @@ -1375,12 +1368,6 @@ bool ToneGenerator::prepareWave() { } return true; - -prepareWave_exit: - - clearWaveGens(); - - return false; } |