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

Commit 811ad27d authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Disconnect held call when answering third call." into lmp-mr1-dev

parents 0b4e8a27 e94a8f1e

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

+7 −0
Original line number Diff line number Diff line
@@ -644,6 +644,13 @@ public final class CallsManager extends Call.ListenerBase { 
                        mForegroundCall.disconnect();

                    }

                } else {

                    Call heldCall = getHeldCall();

                    if (heldCall != null) {

                        Log.v(this, "Disconnecting held call %s before holding active call.",

                                heldCall);

                        heldCall.disconnect();

                    }



                    Log.v(this, "Holding active/dialing call %s before answering incoming call %s.",

                            mForegroundCall, call);

                    mForegroundCall.hold();