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

Commit afb17686 authored by Tyler Gunn's avatar Tyler Gunn Committed by Brad Ebinger
Browse files

Fixes for IMS Conferences via the RemoteConnectionService API. 

IMS Conferences are problematic to Telecom when a connection manager is
used.  Both addExistingConnection and addConference will result in the
addition of duplicate conference participants and conferences to Telecom.
This is because Telecom does not have a means of de-duping the two, which
have new IDs created for them when they're added via a ConnectionService.

To fix this, added a workaround which packages the original existing
connection or conference id into the connection/conference extras which
are sent to the connection manager.  This way, the connection mgr can use
the same connection/conference ID was was used by the original
ConnectionService, and also perform some de-duping.

Its not optimal, and this should be fixed better in the future.

Bug: 31464792
Change-Id: I7b63f145c741c29e1735f50a473585f26ef70fc7
parent 0dbb6ee0

src/com/android/server/telecom/Call.java

+58 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.RemoteException; 
import android.os.Trace;

import android.provider.ContactsContract.Contacts;

import android.telecom.CallAudioState;

import android.telecom.Conference;

import android.telecom.DisconnectCause;

import android.telecom.Connection;

import android.telecom.GatewayInfo;
@@ -394,6 +395,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable { 


    private PhoneNumberUtilsAdapter mPhoneNumberUtilsAdapter;



    /**

     * For {@link Connection}s or {@link android.telecom.Conference}s added via a ConnectionManager

     * using the {@link android.telecom.ConnectionService#addExistingConnection(PhoneAccountHandle,

     * Connection)} or {@link android.telecom.ConnectionService#addConference(Conference)},

     * indicates the ID of this call as it was referred to by the {@code ConnectionService} which

     * originally created it.

     *

     * See {@link Connection#EXTRA_ORIGINAL_CONNECTION_ID} for more information.

     */

    private String mOriginalConnectionId;



    /**

     * Persists the specified parameters and initializes the new instance.

     *
@@ -1163,6 +1175,34 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable { 
        mConnectionService.addCall(this);

    }



    /**

     * Perform an in-place replacement of the {@link ConnectionServiceWrapper} for this Call.

     * Removes the call from its former {@link ConnectionServiceWrapper}, ensuring that the

     * ConnectionService is NOT unbound if the call count hits zero.

     * This is used by the {@link ConnectionServiceWrapper} when handling {@link Connection} and

     * {@link Conference} additions via a ConnectionManager.

     * The original {@link android.telecom.ConnectionService} will directly add external calls and

     * conferences to Telecom as well as the ConnectionManager, which will add to Telecom.  In these

     * cases since its first added to via the original CS, we want to change the CS responsible for

     * the call to the ConnectionManager rather than adding it again as another call/conference.

     *

     * @param service The new {@link ConnectionServiceWrapper}.

     */

    public void replaceConnectionService(ConnectionServiceWrapper service) {

        Preconditions.checkNotNull(service);



        if (mConnectionService != null) {

            ConnectionServiceWrapper serviceTemp = mConnectionService;

            mConnectionService = null;

            serviceTemp.removeCall(this);

            serviceTemp.decrementAssociatedCallCount(true /*isSuppressingUnbind*/);

        }



        service.incrementAssociatedCallCount();

        mConnectionService = service;

        mAnalytics.setCallConnectionService(service.getComponentName().flattenToShortString());

    }



    /**

     * Clears the associated connection service.

     */
@@ -2227,6 +2267,24 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable { 
        }

    }



    public void setOriginalConnectionId(String originalConnectionId) {

        mOriginalConnectionId = originalConnectionId;

    }



    /**

     * For calls added via a ConnectionManager using the

     * {@link android.telecom.ConnectionService#addExistingConnection(PhoneAccountHandle,

     * Connection)}, or {@link android.telecom.ConnectionService#addConference(Conference)} APIS,

     * indicates the ID of this call as it was referred to by the {@code ConnectionService} which

     * originally created it.

     *

     * See {@link Connection#EXTRA_ORIGINAL_CONNECTION_ID}.

     * @return The original connection ID.

     */

    public String getOriginalConnectionId() {

        return mOriginalConnectionId;

    }



    /**

     * Determines if a {@link Call}'s capabilities bitmask indicates that video is supported either

     * remotely or locally.

src/com/android/server/telecom/CallsManager.java

+38 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Optional;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;
@@ -1692,6 +1693,12 @@ public class CallsManager extends Call.ListenerBase 
        call.setVideoProvider(parcelableConference.getVideoProvider());

        call.setStatusHints(parcelableConference.getStatusHints());

        call.putExtras(Call.SOURCE_CONNECTION_SERVICE, parcelableConference.getExtras());

        // In case this Conference was added via a ConnectionManager, keep track of the original

        // Connection ID as created by the originating ConnectionService.

        Bundle extras = parcelableConference.getExtras();

        if (extras != null && extras.containsKey(Connection.EXTRA_ORIGINAL_CONNECTION_ID)) {

            call.setOriginalConnectionId(extras.getString(Connection.EXTRA_ORIGINAL_CONNECTION_ID));

        }



        // TODO: Move this to be a part of addCall()

        call.addListener(this);
@@ -2095,13 +2102,43 @@ public class CallsManager extends Call.ListenerBase 
        call.setConnectionProperties(connection.getConnectionProperties());

        call.setCallerDisplayName(connection.getCallerDisplayName(),

                connection.getCallerDisplayNamePresentation());



        call.addListener(this);



        // In case this connection was added via a ConnectionManager, keep track of the original

        // Connection ID as created by the originating ConnectionService.

        Bundle extras = connection.getExtras();

        if (extras != null && extras.containsKey(Connection.EXTRA_ORIGINAL_CONNECTION_ID)) {

            call.setOriginalConnectionId(extras.getString(Connection.EXTRA_ORIGINAL_CONNECTION_ID));

        }

        addCall(call);



        return call;

    }



    /**

     * Determines whether Telecom already knows about a Connection added via the

     * {@link android.telecom.ConnectionService#addExistingConnection(PhoneAccountHandle,

     * Connection)} API via a ConnectionManager.

     *

     * See {@link Connection#EXTRA_ORIGINAL_CONNECTION_ID}.

     * @param originalConnectionId The new connection ID to check.

     * @return {@code true} if this connection is already known by Telecom.

     */

    Call getAlreadyAddedConnection(String originalConnectionId) {

        Optional<Call> existingCall = mCalls.stream()

                .filter(call -> originalConnectionId.equals(call.getOriginalConnectionId()) ||

                            originalConnectionId.equals(call.getId()))

                .findFirst();



        if (existingCall.isPresent()) {

            Log.i(this, "isExistingConnectionAlreadyAdded - call %s already added with id %s",

                    originalConnectionId, existingCall.get().getId());

            return existingCall.get();

        }



        return null;

    }



    /**

     * @return A new unique telecom call Id.

     */

src/com/android/server/telecom/ConnectionServiceWrapper.java

+74 −11
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.telecom.Log; 
import android.telecom.Logging.Session;

import android.telecom.ParcelableConference;

import android.telecom.ParcelableConnection;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.StatusHints;

import android.telecom.TelecomManager;
@@ -370,6 +369,8 @@ public class ConnectionServiceWrapper extends ServiceBinder { 
                                "call id %s", callId);

                        return;

                    }

                    logIncoming("addConferenceCall %s %s [%s]", callId, parcelableConference,

                            parcelableConference.getConnectionIds());



                    // Make sure that there's at least one valid call. For remote connections

                    // we'll get a add conference msg from both the remote connection service
@@ -387,16 +388,46 @@ public class ConnectionServiceWrapper extends ServiceBinder { 
                        return;

                    }



                    // need to create a new Call

                    PhoneAccountHandle phAcc = null;

                    if (parcelableConference != null &&

                            parcelableConference.getPhoneAccount() != null) {

                        phAcc = parcelableConference.getPhoneAccount();

                    }

                    Call conferenceCall = mCallsManager.createConferenceCall(callId,



                    Bundle connectionExtras = parcelableConference.getExtras();



                    String connectIdToCheck = null;

                    if (connectionExtras != null && connectionExtras

                            .containsKey(Connection.EXTRA_ORIGINAL_CONNECTION_ID)) {

                        // Conference was added via a connection manager, see if its original id is

                        // known.

                        connectIdToCheck = connectionExtras

                                .getString(Connection.EXTRA_ORIGINAL_CONNECTION_ID);

                    } else {

                        connectIdToCheck = callId;

                    }



                    Call conferenceCall;

                    // Check to see if this conference has already been added.

                    Call alreadyAddedConnection = mCallsManager

                            .getAlreadyAddedConnection(connectIdToCheck);

                    if (alreadyAddedConnection != null && mCallIdMapper.getCall(callId) == null) {

                        // We are currently attempting to add the conference via a connection mgr,

                        // and the originating ConnectionService has already added it.  Instead of

                        // making a new Telecom call, we will simply add it to the ID mapper here,

                        // and replace the ConnectionService on the call.

                        mCallIdMapper.addCall(alreadyAddedConnection, callId);

                        alreadyAddedConnection.replaceConnectionService(

                                ConnectionServiceWrapper.this);

                        conferenceCall = alreadyAddedConnection;

                    } else {

                        // need to create a new Call

                        Call newConferenceCall = mCallsManager.createConferenceCall(callId,

                                phAcc, parcelableConference);

                    mCallIdMapper.addCall(conferenceCall, callId);

                    conferenceCall.setConnectionService(ConnectionServiceWrapper.this);

                        mCallIdMapper.addCall(newConferenceCall, callId);

                        newConferenceCall.setConnectionService(ConnectionServiceWrapper.this);

                        conferenceCall = newConferenceCall;

                    }



                    Log.d(this, "adding children to conference %s phAcc %s",

                            parcelableConference.getConnectionIds(), phAcc);
@@ -627,10 +658,11 @@ public class ConnectionServiceWrapper extends ServiceBinder { 
            long token = Binder.clearCallingIdentity();

            try {

                synchronized (mLock) {

                    logIncoming("setConferenceableConnections %s %s", callId,

                            conferenceableCallIds);



                    Call call = mCallIdMapper.getCall(callId);

                    if (call != null) {

                        logIncoming("setConferenceableConnections %s %s", callId,

                                conferenceableCallIds);

                        List<Call> conferenceableCalls =

                                new ArrayList<>(conferenceableCallIds.size());

                        for (String otherId : conferenceableCallIds) {
@@ -674,8 +706,37 @@ public class ConnectionServiceWrapper extends ServiceBinder { 
                            phoneAccountHandle = accountHandle;

                        }

                    }

                    // Allow the Sim call manager account as well, even if its disabled.

                    if (phoneAccountHandle == null && callingPhoneAccountHandle != null) {

                        if (callingPhoneAccountHandle.equals(

                                mPhoneAccountRegistrar.getSimCallManager(userHandle))) {

                            phoneAccountHandle = callingPhoneAccountHandle;

                        }

                    }

                    if (phoneAccountHandle != null) {

                        logIncoming("addExistingConnection %s %s", callId, connection);



                        Bundle connectionExtras = connection.getExtras();

                        String connectIdToCheck = null;

                        if (connectionExtras != null && connectionExtras

                                .containsKey(Connection.EXTRA_ORIGINAL_CONNECTION_ID)) {

                            connectIdToCheck = connectionExtras

                                    .getString(Connection.EXTRA_ORIGINAL_CONNECTION_ID);

                        } else {

                            connectIdToCheck = callId;

                        }

                        // Check to see if this Connection has already been added.

                        Call alreadyAddedConnection = mCallsManager

                                .getAlreadyAddedConnection(connectIdToCheck);



                        if (alreadyAddedConnection != null

                                && mCallIdMapper.getCall(callId) == null) {

                            mCallIdMapper.addCall(alreadyAddedConnection, callId);

                            alreadyAddedConnection

                                    .replaceConnectionService(ConnectionServiceWrapper.this);

                            return;

                        }



                        Call existingCall = mCallsManager

                                .createCallForExistingConnection(callId, connection);

                        mCallIdMapper.addCall(existingCall, callId);
@@ -1153,11 +1214,13 @@ public class ConnectionServiceWrapper extends ServiceBinder { 
    }



    private void logIncoming(String msg, Object... params) {

        Log.d(this, "ConnectionService -> Telecom: " + msg, params);

        Log.d(this, "ConnectionService -> Telecom[" + mComponentName.flattenToShortString() + "]: "

                + msg, params);

    }



    private void logOutgoing(String msg, Object... params) {

        Log.d(this, "Telecom -> ConnectionService: " + msg, params);

        Log.d(this, "Telecom -> ConnectionService[" + mComponentName.flattenToShortString() + "]: "

                + msg, params);

    }



    private void queryRemoteConnectionServices(final UserHandle userHandle,

src/com/android/server/telecom/ServiceBinder.java

+6 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ abstract class ServiceBinder { 
    private final String mServiceAction;



    /** The component name of the service to bind to. */

    private final ComponentName mComponentName;

    protected final ComponentName mComponentName;



    /** The set of callbacks waiting for notification of the binding's success or failure. */

    private final Set<BindCallback> mCallbacks = new ArraySet<>();
@@ -228,12 +228,16 @@ abstract class ServiceBinder { 
    }



    final void decrementAssociatedCallCount() {

        decrementAssociatedCallCount(false /*isSuppressingUnbind*/);

    }



    final void decrementAssociatedCallCount(boolean isSuppressingUnbind) {

        if (mAssociatedCallCount > 0) {

            mAssociatedCallCount--;

            Log.v(this, "Call count decrement %d, %s", mAssociatedCallCount,

                    mComponentName.flattenToShortString());



            if (mAssociatedCallCount == 0) {

            if (!isSuppressingUnbind && mAssociatedCallCount == 0) {

                unbind();

            }

        } else {