commit a920ee99dc97b54b661d1238d8c26ac07c875bed
author Android (Google) Code Review <android-gerrit@google.com> Thu Jul 09 14:51:54 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 09 14:51:54 2009 -0700
tree eecb248d79dba499258139edfbcc128b909ea9f2
parent 699f095c05229c5f3d21c54d55698de4f30eaa35
parent a7e0e8b4c429fc68eb1bd5b5a30f5b91352288f9

Merge change 6636

* changes:
  Implemented the metadata changed notification filters.

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;