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

Commit 7a57cc29 authored by Muhammed Siju's avatar Muhammed Siju Committed by Hariprasad Jayakumar
Browse files

IMS: Add phoneaccount to ims conference call. 

Retrieve phoneaccount from ParcelableConference coming from
TeleService and set that account to Telecom Conference call.
This prevents hold and dial request from getting invoked from
Telecom during adding a call on top of an existing ims 3 way
conference call.

Change-Id: I000b10bcf9a4333f528db2734fe9811b1faef0e2
CRs-Fixed: 770795
parent ce0d89da

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

+2 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,8 @@ public final class CallsManager extends Call.ListenerBase { 
            // NOTE: If the amount of live calls changes beyond 1, this logic will probably

            // have to change.

            Call liveCall = getFirstCallWithState(call, LIVE_CALL_STATES);

            Log.i(this, "makeRoomForOutgoingCall call = " + call + " livecall = " +

                   liveCall);



            if (call == liveCall) {

                // If the call is already the foreground call, then we are golden.

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

+7 −3
Original line number Diff line number Diff line
@@ -241,13 +241,17 @@ final class ConnectionServiceWrapper extends ServiceBinder<IConnectionService> { 
                                (ParcelableConference) args.arg2;



                        // need to create a new Call

                        PhoneAccountHandle phAcc = null;

                        if (parcelableConference != null) {

                            phAcc = parcelableConference.getPhoneAccount();

                        }

                        Call conferenceCall = mCallsManager.createConferenceCall(

                                null, parcelableConference);

                                phAcc, parcelableConference);

                        mCallIdMapper.addCall(conferenceCall, id);

                        conferenceCall.setConnectionService(ConnectionServiceWrapper.this);



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

                                parcelableConference.getConnectionIds());

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

                                parcelableConference.getConnectionIds(), phAcc);

                        for (String callId : parcelableConference.getConnectionIds()) {

                            Call childCall = mCallIdMapper.getCall(callId);

                            Log.d(this, "found child: %s", callId);