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

Commit 0baff824 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Clean up RTT streams properly after termination" into rvc-dev am: 2d7cf2be am: 6ca87e61 

Change-Id: If7fa53b3e1bf14c4ee175dbd7c3dd3db681a79ca
parents 824c461f 6ca87e61

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;