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

Commit 790eed91 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in... 

am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '0e27e89d':
  Protect against INCALL->RINGING transition in AudioManager
parents 10feec62 0e27e89d

src/com/android/server/telecom/CallAudioManager.java

+5 −0
Original line number Diff line number Diff line
@@ -393,7 +393,12 @@ final class CallAudioManager extends CallsManagerListenerBase 
        Preconditions.checkState(hasFocus());

        int oldMode = mAudioManager.getMode();

        Log.v(this, "Request to change audio mode from %d to %d", oldMode, newMode);



        if (oldMode != newMode) {

            if (oldMode == AudioManager.MODE_IN_CALL && newMode == AudioManager.MODE_RINGTONE) {

                Log.i(this, "Transition from IN_CALL -> RINGTONE. Resetting to NORMAL first.");

                mAudioManager.setMode(AudioManager.MODE_NORMAL);

            }

            mAudioManager.setMode(newMode);

            mMostRecentlyUsedMode = newMode;

        }