Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
  Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call
This commit is contained in:
Eric Laurent
2009-07-09 12:49:38 -07:00
committed by The Android Open Source Project
parent ad921cb4a4 5964e73774
commit cfe2c402d9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmedia/ToneGenerator.cpp
View File

@@ -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;