Merge "CallTracker: Process HANGUP before DIAL response" (9102b25a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -738,11 +738,14 @@ public final class CdmaCallTracker extends CallTracker {
		}

		if (conn == mPendingMO) {
		// We're hanging up an outgoing call that doesn't have it's
		// GSM index assigned yet
		// Re-start Ecm timer when an uncompleted emergency call ends
		if (mIsEcmTimerCanceled) {
		handleEcmTimer(CDMAPhone.RESTART_ECM_TIMER);
		}

		if (Phone.DEBUG_PHONE) log("hangup: set hangupPendingMO to true");
		mHangupPendingMO = true;
		// Allow HANGUP to RIL during pending MO is present
		log("hangup conn with callId '-1' as there is no DIAL response yet ");
		mCi.hangupConnection(-1, obtainCompleteMessage());
		} else if ((conn.getCall() == mRingingCall)
		&& (mRingingCall.getState() == CdmaCall.State.WAITING)) {
		// Handle call waiting hang up case.

+3 −5

Original line number	Diff line number	Diff line
		@@ -760,11 +760,9 @@ public final class GsmCallTracker extends CallTracker {
		}

		if (conn == mPendingMO) {
		// We're hanging up an outgoing call that doesn't have it's
		// GSM index assigned yet

		if (Phone.DEBUG_PHONE) log("hangup: set hangupPendingMO to true");
		mHangupPendingMO = true;
		// Allow HANGUP to RIL during pending MO is present
		log("hangup conn with callId '-1' as there is no DIAL response yet ");
		mCi.hangupConnection(-1, obtainCompleteMessage());
		} else {
		try {
		mCi.hangupConnection (conn.getGSMIndex(), obtainCompleteMessage());