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

Commit 62d18d5f authored by Anju Mathapati's avatar Anju Mathapati Committed by Android Git Automerger
Browse files

am f22c524d: am c88574c7: IMS: Add phoneaccount to ims conference call. 

* commit 'f22c524d':
  IMS: Add phoneaccount to ims conference call.
parents a5015efe f22c524d

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

+2 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,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

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



                        // need to create a new Call

                        PhoneAccountHandle phAcc = null;

                        if (parcelableConference != null &&

                                parcelableConference.getPhoneAccount() != 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);