commit d863fc03f156c8636a89a94af338c88aa91edbfb
author Sungjae <sung_jae.kim@samsung.com> Wed Nov 20 13:25:01 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 20 13:25:01 2019 -0800
tree 974dff9f6701ea38c2f4acda534b4d0434f39fd5
parent 796692213fbb59bc96f269ade627079089647fe6
parent 213636d63ee6a6a76a7ef43c265b430228bca98a

Merge "Change the condition strictly for comparing address" am: 13cb63be27
am: 213636d63e

Change-Id: I46699e1102c2e7ecb680330f08c996eb0d3e3288

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..fc9e255 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()