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

Commit 7374d815 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Don't call onStartRtt unless RTT property changes" into pi-dev am: 4b4a8b8b 

am: dd212b4c

Change-Id: Ia588f43826f89f120f613e046b62321312cdadd7
parents 0da63b36 dd212b4c

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

+3 −3
Original line number Diff line number Diff line
@@ -1459,7 +1459,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.
@@ -1474,8 +1476,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);

            }