commit 67a0df44844eb5840b99d829633b46a575e79a65
author Naina Nalluri <nainanalluri@google.com> Wed Nov 20 22:57:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 20 22:57:26 2019 +0000
tree 4254d2c2ef31b61aebb5036eb42025654e2be534
parent 1b8eecde14cd535ca5aaa3a9aab0d889bcb21f37
parent 8ff344d1ccb6cd0971d327ac787aa6cc6a3e5c11

Merge "Erase modem config on factoryReset"

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 d8e9c32..ec7cffc 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -136,7 +136,7 @@
                         if (connection != null &&
                             ((connection.getAddress() != null &&
                             mOriginalConnection.getAddress() != null &&
-                            mOriginalConnection.getAddress().contains(connection.getAddress())) ||
+                            mOriginalConnection.getAddress().equals(connection.getAddress())) ||
                             connection.getState() == mOriginalConnection.getStateBeforeHandover())) {
                             Log.d(TelephonyConnection.this,
                                     "SettingOriginalConnection " + mOriginalConnection.toString()
@@ -645,6 +645,7 @@
         @Override
         public void onRttTerminated() {
             updateConnectionProperties();
+            refreshConferenceSupported();
             sendRttSessionRemotelyTerminated();
         }