commit 7ae46ae8924a30019d849c6fe101cb0ae4e557ff
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 17 02:24:43 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 17 02:24:43 2018 +0000
tree 69c7bf28604ae07d0d84c3cea810b8ea67967689
parent f5b8f186aa7d717d34e84e61b51b07ec8c0669c7
parent c443d491b9397f6878f03187b9d5d35f2717d9c0

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

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

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 6a060fd..d975a4f 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -1454,7 +1454,9 @@
         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 @@
             }
             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);
             }