Merge "IMS: Add phoneaccount to ims conference call." (43371300) · Commits · e / os / android_packages_services_Telecomm

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.

+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);