commit 384b69dfd8fc6755f7b7709a045ebb6a4efe9481
author Eric Laurent <elaurent@google.com> Tue Mar 26 00:28:42 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 00:28:42 2013 +0000
tree b94c370746e62ef79eaffeba51c32bf7746359c9
parent 66a839f5d040764ccc490d6573c96243b84cd8f5
parent bbef2b3f42de20c7d2a920de62d3d1eca40e054f

am 19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev

* commit '19c11e1c854ae3c20bacf66fbb20d53dcdb8d100':
  ToneGenerator: optimize silent tone

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 42584fe..1c0268f 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -885,6 +885,11 @@
     if ((toneType < 0) || (toneType >= NUM_TONES))
         return lResult;
 
+    toneType = getToneForRegion(toneType);
+    if (toneType == TONE_CDMA_SIGNAL_OFF) {
+        return true;
+    }
+
     if (mState == TONE_IDLE) {
         ALOGV("startTone: try to re-init AudioTrack");
         if (!initAudioTrack()) {
@@ -897,7 +902,6 @@
     mLock.lock();
 
     // Get descriptor for requested tone
-    toneType = getToneForRegion(toneType);
     mpNewToneDesc = &sToneDescriptors[toneType];
 
     mDurationMs = durationMs;