Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b2ba67 authored by Grant Menke's avatar Grant Menke Committed by Android Build Coastguard Worker
Browse files

Update ConnectionService#addConferenceFromConnection to properly cleanup the conn. 

This CL ensures onConnectionRemoved is signaled for the original Connection when ConnectionService#addConferenceFromConnection is called. This prevents a regression that was occurring where remote conferences were errantly not being considered holdable since the topHoldableCount was hitting 2.

Test: atest ImsCallingTest
Fixes: 445215865
Flag: com.android.internal.telephony.flags.reuse_original_conn_remote_conf_behavior
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:eabf2e9a069e8a5be5c8d5d9372af11d81cb7ee2
Merged-In: Ife1649671808b113243c2bb55f0f38562e33cac8
Change-Id: Ife1649671808b113243c2bb55f0f38562e33cac8
parent 6c06f36a

telecomm/framework/java/android/telecom/ConnectionService.java

+1 −0
Original line number Diff line number Diff line
@@ -3089,6 +3089,7 @@ public abstract class ConnectionService extends Service { 
            // Conduct cleanup by getting rid of the original connection in Telecom here:

            mConnectionById.remove(id);

            mIdByConnection.remove(originalConnection);

            onConnectionRemoved(originalConnection);

        } else {

            Log.w(this, "addConferenceFromConnection: Original connection not "

                    + "found in CS.");