diff options
| author | Eric Laurent <elaurent@google.com> | 2009-07-09 12:49:38 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-09 12:49:38 -0700 |
| commit | cfe2c402d92385dca8204998d402f80cf97e6250 (patch) | |
| tree | b3a555b19173e343eb4bfc242970c9a5c1a12717 /media | |
| parent | ad921cb4a421e8caf241b977818cf0b9fd19303c (diff) | |
| parent | 5964e73774b381748013b91d04dfb6fc60f533ee (diff) | |
| download | frameworks_base-cfe2c402d92385dca8204998d402f80cf97e6250.zip frameworks_base-cfe2c402d92385dca8204998d402f80cf97e6250.tar.gz frameworks_base-cfe2c402d92385dca8204998d402f80cf97e6250.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ audioCallback_EndLoop: 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; |