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

Commit 2d7cf2be authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Clean up RTT streams properly after termination" into rvc-dev

parents 38ca1aa6 7500029a

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;