commit 3516b4e0d17e244731a6d4e58fff81ddb4156253
author Hall Liu <hallliu@google.com> Wed Jun 27 16:25:10 2018 -0700
committer Hall Liu <hallliu@google.com> Wed Jun 27 16:25:10 2018 -0700
tree 268f0e5a6148ddc252b1fb989bb3be65bd023125
parent 67ff0378b1bdc39ece2a384a2f2f58b1223f1ab2

Don't call onStartRtt unless RTT property changes

Don't call onStartRtt inside the call connection property change unless
the RTT property flipped to on -- this'll send spurious RTT requests if
RTT was already on.

Change-Id: If8ee4e9bf994f1ed6c6fc58c3f224445493f9c5d
Fixes: 110855750
Test: manual

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 04f06a2..bc20d1c 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -1453,7 +1453,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.
@@ -1468,8 +1470,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);
             }