IMS: merge option not shown after srvcc
After srvcc, conferenceable property set by the Telephony connection
service is getting overridden by Ims conference controller. So remove
the connection from Ims conference controller after adding it to
Telephony conference controller.
Bug: 21953444
Change-Id: I5e4ec8b8c7c96f4d8049344beaa117b976db9cea
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);
}
}
}