commit 699f095c05229c5f3d21c54d55698de4f30eaa35
author Eric Laurent <elaurent@google.com> Thu Jul 09 12:49:38 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Jul 09 12:49:38 2009 -0700
tree da51b4b1376ef087a0951c4e614e7c315d7ea8d4
parent 814914cd0858cafaa6ad625e3012de97d213636d
parent c38bb0614dc0b5dee682b9a1de47de5ae7d215d8

am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
  Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index c22cd53..5435da7 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1225,6 +1225,8 @@
             LOGV("Cbk restarting track\n");
             if (lpToneGen->prepareWave()) {
                 lpToneGen->mState = TONE_STARTING;
+                // must reload lpToneDesc as prepareWave() may change mpToneDesc
+                lpToneDesc = lpToneGen->mpToneDesc;
             } else {
                 LOGW("Cbk restarting prepareWave() failed\n");
                 lpToneGen->mState = TONE_IDLE;