Merge "Fix incorrect call radio type on UI during silent redial" into nyc-mr1-dev (6f62aeae) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -741,6 +741,7 @@ public class GsmCdmaCallTracker extends CallTracker {
		boolean hasAnyCallDisconnected = false;
		boolean needsPollDelay = false;
		boolean unknownConnectionAppeared = false;
		int handoverConnectionsSize = mHandoverConnections.size();

		//CDMA
		boolean noConnectionExists = true;
		@@ -1066,6 +1067,13 @@ public class GsmCdmaCallTracker extends CallTracker {
		mPhone.notifyPreciseCallStateChanged();
		}

		// If all handover connections are mapped during this poll process clean it up
		if (handoverConnectionsSize > 0 && mHandoverConnections.size() == 0) {
		Phone imsPhone = mPhone.getImsPhone();
		if (imsPhone != null) {
		imsPhone.callEndCleanupHandOverCallIfAny();
		}
		}
		//dumpState();
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -1009,6 +1009,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		if (DBG) log("callEndCleanupHandOverCallIfAny, mHandoverCall.mConnections="
		+ mHandoverCall.mConnections);
		mHandoverCall.mConnections.clear();
		mConnections.clear();
		mState = PhoneConstants.State.IDLE;
		}
		}