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

Commit 18746114 authored by Ravindra's avatar Ravindra Committed by Linux Build Service Account
Browse files

Fix to add normal call on top of conference call 

Compare sub Id of any of the child call in a conference call as
the phone account for conference call will be null.

CRs-Fixed: 739513

Change-Id: I5e8caa3b0645119212bb9f671ed8653a4cdcee79
parent 659fec88

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

+8 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,14 @@ public final class CallsManager extends Call.ListenerBase { 
                    continue;

                }



                if ((call.getTargetPhoneAccount() == null) && (call.getChildCalls().size() > 1)) {

                    Call child = call.getChildCalls().get(0);

                    PhoneAccountHandle childph = child.getTargetPhoneAccount();

                    if (childph.getId().equals(subId)) {

                        return call;

                    }

                }



                if (currentState == call.getState() && call.getTargetPhoneAccount() != null

                        && call.getTargetPhoneAccount().equals(subId)) {

                    return call;