commit 52cf109d6f9a6a1bd62bf321389f824fa4a86845
author Tyler Gunn <tgunn@google.com> Fri Aug 07 01:48:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 07 01:48:37 2015 +0000
tree 973f0fd0b89c5481240b23e0ddb040c250e56fdb
parent 92c9b65881cbf4c96a17fbad57c127bea5b549fa
parent 762146ee7b990b694f7e3b8ae3e1fcf10ec2966b

Merge "Set CALL_SUBJECT capability on phone accts if instant lettering available." into mnc-dr-dev

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 7d9dbb6..0375073 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -87,7 +87,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());