Commit 99c8520b authored Oct 21, 2014 by Yorke Lee

Once responded to a call, remove it from list of ringing calls

Remove a call from mRingingCalls immediately once it is responded to.
This fixes an erroneous transition as described below
1) Call waiting is received
2) Call waiting is answered
3) Currently active call is put on hold
4) onForegroundCallChanged is called with the new call waiting, before it
goes to active
5) Ringtone is played in Ringer.startRingingOrCallWaiting
This CL ensures that if 4) happens, we do not erroneously transition to
AudioManager.MODE_RINGTONE.

Tested with the following scenarios to ensure that the ringtone/call waiting
tone is correctly sounded, and invalid audio mode transitions are not
encountered.

1) Multiple MT calls in a row
2) MT call + call waiting + reject
3) MT call + call waiting + answer
4) Conference call + call waiting + reject
5) Conference call + call waiting + answer

Bug: 18058600
Change-Id: I97cd798656cc56c937964fb1ebb3032c4cee4ed7

parent c9fe671f

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -140,12 +140,8 @@ final class Ringer extends CallsManagerListenerBase {
		private void onRespondedToIncomingCall(Call call) {
		// Only stop the ringer if this call is the top-most incoming call.
		if (getTopMostUnansweredCall() == call) {
		stopRinging();
		stopCallWaiting();
		removeFromUnansweredCall(call);
		}

		// We do not remove the call from mRingingCalls until the call state changes from
		// STATE_RINGING or the call is removed. see onCallStateChanged or onCallRemoved.
		}

		private Call getTopMostUnansweredCall() {