Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe2c402 authored by Eric Laurent's avatar Eric Laurent Committed by The Android Open Source Project
Browse files

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

Merge commit '5964e737'

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

media/libmedia/ToneGenerator.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -1225,6 +1225,8 @@ audioCallback_EndLoop: 
            LOGV("Cbk restarting track\n");

            LOGV("Cbk restarting track\n");

            if (lpToneGen->prepareWave()) {

            if (lpToneGen->prepareWave()) {

                lpToneGen->mState = TONE_STARTING;

                lpToneGen->mState = TONE_STARTING;

                // must reload lpToneDesc as prepareWave() may change mpToneDesc

                lpToneDesc = lpToneGen->mpToneDesc;

            } else {

            } else {

                LOGW("Cbk restarting prepareWave() failed\n");

                LOGW("Cbk restarting prepareWave() failed\n");

                lpToneGen->mState = TONE_IDLE;

                lpToneGen->mState = TONE_IDLE;