commit 8763d9feb66de4182c6e1e67f66c6eb1f8c11ba8
author Hall Liu <hallliu@google.com> Tue Jun 12 17:12:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 12 17:12:57 2018 -0700
tree b038c61370c1b16e0c8abb6585a230b3c2226008
parent f5b450464e89efd4ff7bf41b00a781e130c22ded
parent 934a45dd19811f628dbd387c7e9d6c8cc7ccee2b

Merge "Don't set RTT property if original connection null" am: 2f66efef69
am: 934a45dd19

Change-Id: I6f3478bb6319439f71983f4b4b32dd49112493ab

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 d6fb3ad..c06fd27 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();
         }