commit 9aa89e7d7f8e5afe0aa14a9599c8fd8de51469b6
author Hall Liu <hallliu@google.com> Tue Jun 12 18:00:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 12 18:00:49 2018 -0700
tree a1e1027ad176f45cf6ee34de73bce683080df0d9
parent c3dbff7ccd08a6acb34de9df95424a2d30deaaad
parent 8763d9feb66de4182c6e1e67f66c6eb1f8c11ba8

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

Change-Id: Iad1cb66af371013597647eb903a55d87ce7ed248

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