commit 4fc3e841358164a661c78f78bc617f5ac879aa35
author Andreas Huber <andih@google.com> Tue Mar 26 21:57:28 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 26 21:57:28 2013 +0000
tree 66d68856e168182bbea076d1584db30802195acc
parent 6386b50b67185a966d43ee761acdfe7add569d10
parent eaf5381f38bf6c3ecb5fe32a8351c26a447549f5

Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 1c0268f..58d495e 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -803,6 +803,7 @@
     ALOGV("ToneGenerator constructor: streamType=%d, volume=%f", streamType, volume);
 
     mState = TONE_IDLE;
+    mpAudioTrack = NULL;
 
     if (AudioSystem::getOutputSamplingRate(&mSamplingRate, streamType) != NO_ERROR) {
         ALOGE("Unable to marshal AudioFlinger");
@@ -811,7 +812,6 @@
     mThreadCanCallJava = threadCanCallJava;
     mStreamType = streamType;
     mVolume = volume;
-    mpAudioTrack = NULL;
     mpToneDesc = NULL;
     mpNewToneDesc = NULL;
     // Generate tone by chunks of 20 ms to keep cadencing precision