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

Commit 7ae46ae8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't call onStartRtt unless RTT property changes"

parents f5b8f186 c443d491

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

+3 −3
Original line number Diff line number Diff line
@@ -1454,7 +1454,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.
@@ -1469,8 +1471,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);

            }