commit 7d0bf002a4c849fb13e0893129874db970551e93
author Pavel Zhamaitsiak <pavelz@google.com> Thu Dec 11 00:58:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 11 00:58:07 2014 +0000
tree 2902755f47932cf881d2c902dd62507e08aee96c
parent 9a201cf769abddd8987aff990a425f44899dff2a
parent 0fd40fb9429a25a38feb41ab0568b16b69139d82

Merge "IMS: SRVCC related fixes." into lmp-mr1-dev

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 9877269..7f92c92 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -60,7 +60,14 @@
                     AsyncResult ar = (AsyncResult) msg.obj;
                     com.android.internal.telephony.Connection connection =
                          (com.android.internal.telephony.Connection) ar.result;
-                    setOriginalConnection(connection);
+                    if ((connection.getAddress() != null &&
+                                    mOriginalConnection.getAddress() != null &&
+                            mOriginalConnection.getAddress().contains(connection.getAddress())) ||
+                            connection.getStateBeforeHandover() == mOriginalConnection.getState()) {
+                        Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
+                                mOriginalConnection.toString() + " with " + connection.toString());
+                        setOriginalConnection(connection);
+                    }
                     break;
                 case MSG_RINGBACK_TONE:
                     Log.v(TelephonyConnection.this, "MSG_RINGBACK_TONE");