commit 4eff193a405b576603be380f6e215e0a7bdf6f50
author Eric Laurent <elaurent@google.com> Tue Mar 26 12:40:43 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 12:40:43 2013 -0700
tree f1f73f399cab41da6a204177610f341e0157a63e
parent 9abcb36d2f667efd95ef84504ae549bd53980a6f
parent db372594bf27390d2bee089e35c5fb8f67370026

am 6386b50b: ToneGenerator: fix AudioTrack pointer init

* commit '6386b50b67185a966d43ee761acdfe7add569d10':
  ToneGenerator: fix AudioTrack pointer init

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