diff options
Diffstat (limited to 'src/com/android/services/telephony/TelephonyConnectionService.java')
| -rw-r--r-- | src/com/android/services/telephony/TelephonyConnectionService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java index 6feb706ab3..1e1e15abb6 100644 --- a/src/com/android/services/telephony/TelephonyConnectionService.java +++ b/src/com/android/services/telephony/TelephonyConnectionService.java @@ -672,7 +672,6 @@ public class TelephonyConnectionService extends ConnectionService { } TelephonyConnection connection = (TelephonyConnection)conn; - ImsConference conference = new ImsConference(TelecomAccountRegistry.getInstance(this), mTelephonyConnectionServiceProxy, connection, phoneAccountHandle, () -> true, @@ -2827,6 +2826,9 @@ public class TelephonyConnectionService extends ConnectionService { // when we go between CDMA and GSM we should replace the TelephonyConnection. if (connection.isImsConnection()) { Log.d(this, "Adding IMS connection to conference controller: " + connection); + if (connection.getTelephonyConnectionService() == null) { + connection.setTelephonyConnectionService(this); + } mImsConferenceController.add(connection); mTelephonyConferenceController.remove(connection); if (connection instanceof CdmaConnection) { |