commit ae7dc63b997ddab41a1fbf9db59d18322ce49ef8
author Anthony Lee <anthonylee@google.com> Wed Jul 01 14:10:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 01 14:10:50 2015 +0000
tree d9d0ff91da5c7c9f8fcfc11cd7f80664e8a8ed1b
parent b05b14e521c43cec95b7e8a21323c11e6af4036f
parent 734132fa65036d0b1932364849b0262c84442fe8

Merge "IMS: merge option not shown after srvcc" into mnc-dev

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index a1729b7..9312992 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -569,6 +569,8 @@
                 Log.d(this, "Adding CDMA connection to conference controller: " + connection);
                 mCdmaConferenceController.add((CdmaConnection)connection);
             }
+            Log.d(this, "Removing connection from IMS conference controller: " + connection);
+            mImsConferenceController.remove(connection);
         }
     }
 }