commit 2f66efef69ebd73191016bce1bacbd996b3693d8
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 12 22:19:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 12 22:19:27 2018 +0000
tree 898c4b001c763f43f1eb4554501d566af0e6983f
parent b9ff877760233b7ac4a615b118f76a9dfedaeec7
parent b5905dca1a9707ea95135f3e222fdc91d9999a00

Merge "Don't set RTT property if original connection null"

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 55a13bb..9cb93ac 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -554,7 +554,11 @@
 
         @Override
         public void onRttInitiated() {
-            updateConnectionProperties();
+            if (mOriginalConnection != null) {
+                // if mOriginalConnection is null, the properties will get set when
+                // mOriginalConnection gets set.
+                updateConnectionProperties();
+            }
             sendRttInitiationSuccess();
         }