commit e97172a1267885b8b1962eaaeb66e4b8631490ea
author Anthony Lee <anthonylee@google.com> Thu Aug 06 20:01:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 20:01:59 2015 +0000
tree f3a2d7fa90cf9893e7353f188c5c12fe4e55c2ac
parent b8b27419a18376b630810e95af4195e94f132449
parent 92c9b65881cbf4c96a17fbad57c127bea5b549fa

am 92c9b658: Merge "Fix bug in conference call SRVCC." into mnc-dr-dev

* commit '92c9b65881cbf4c96a17fbad57c127bea5b549fa':
  Fix bug in conference call SRVCC.

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 02d057f..8c05c87 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -663,6 +663,7 @@
             mConferenceHost.removeTelephonyConnectionListener(mTelephonyConnectionListener);
             mConferenceHost = null;
             setDisconnected(new DisconnectCause(DisconnectCause.OTHER));
+            disconnectConferenceParticipants();
             destroy();
         }
 

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 9f96bd4..913595b 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -79,7 +79,7 @@
                             ((connection.getAddress() != null &&
                             mOriginalConnection.getAddress() != null &&
                             mOriginalConnection.getAddress().contains(connection.getAddress())) ||
-                            connection.getStateBeforeHandover() == mOriginalConnection.getState())) {
+                            connection.getState() == mOriginalConnection.getStateBeforeHandover())) {
                             Log.d(TelephonyConnection.this,
                                     "SettingOriginalConnection " + mOriginalConnection.toString()
                                             + " with " + connection.toString());