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

Commit 8ca77ec7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Display merge icon to add users to existing conference call"

parents d6991884 227a3b68

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

+4 −0
Original line number Diff line number Diff line
@@ -264,6 +264,10 @@ final class ConnectionServiceWrapper extends ServiceBinder<IConnectionService> { 
                        for (String callId : parcelableConference.getConnectionIds()) {

                            Call childCall = mCallIdMapper.getCall(callId);

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

                            if (conferenceCall.getTargetPhoneAccount() == null) {

                                PhoneAccountHandle ph = childCall.getTargetPhoneAccount();

                                conferenceCall.setTargetPhoneAccount(ph);

                            }

                            if (childCall != null) {

                                childCall.setParentCall(conferenceCall);

                            }