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

Commit 4b4a8b8b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't call onStartRtt unless RTT property changes" into pi-dev

parents ff1307c4 3516b4e0

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

+3 −3
Original line number Diff line number Diff line
@@ -1453,7 +1453,9 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        if (changedProperties != 0) {

            int previousProperties = mConnectionProperties;

            mConnectionProperties = connectionProperties;

            if ((mConnectionProperties & Connection.PROPERTY_IS_RTT) ==

            boolean didRttChange =

                    (changedProperties & Connection.PROPERTY_IS_RTT) == Connection.PROPERTY_IS_RTT;

            if (didRttChange && (mConnectionProperties & Connection.PROPERTY_IS_RTT) ==

                    Connection.PROPERTY_IS_RTT) {

                createRttStreams();

                // Call startRtt to pass the RTT pipes down to the connection service.
@@ -1468,8 +1470,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            }

            mWasHighDefAudio = (connectionProperties & Connection.PROPERTY_HIGH_DEF_AUDIO) ==

                    Connection.PROPERTY_HIGH_DEF_AUDIO;

            boolean didRttChange =

                    (changedProperties & Connection.PROPERTY_IS_RTT) == Connection.PROPERTY_IS_RTT;

            for (Listener l : mListeners) {

                l.onConnectionPropertiesChanged(this, didRttChange);

            }