Merge "Clean up RTT streams properly after termination" into rvc-dev am:... (414c850b) · Commits · e / os / android_packages_services_Telecomm

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

+16 −10

Original line number	Diff line number	Diff line
		@@ -1765,7 +1765,8 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		mConnectionProperties = connectionProperties;
		boolean didRttChange =
		(changedProperties & Connection.PROPERTY_IS_RTT) == Connection.PROPERTY_IS_RTT;
		if (didRttChange && (mConnectionProperties & Connection.PROPERTY_IS_RTT) ==
		if (didRttChange) {
		if ((mConnectionProperties & Connection.PROPERTY_IS_RTT) ==
		Connection.PROPERTY_IS_RTT) {
		createRttStreams();
		// Call startRtt to pass the RTT pipes down to the connection service.
		@@ -1776,6 +1777,11 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		if (isEmergencyCall()) {
		mCallsManager.mute(false);
		}
		} else {
		closeRttStreams();
		mInCallToConnectionServiceStreams = null;
		mConnectionServiceToInCallStreams = null;
		}
		}
		mWasHighDefAudio = (connectionProperties & Connection.PROPERTY_HIGH_DEF_AUDIO) ==
		Connection.PROPERTY_HIGH_DEF_AUDIO;