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

Commit b0781107 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Clean up RTT streams properly after termination"

parents 7448800c 3fc87468

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

+16 −10
Original line number Diff line number Diff line
@@ -1716,7 +1716,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.
@@ -1727,6 +1728,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;