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

Commit ad807f14 authored by Andrew Lee's avatar Andrew Lee Committed by Android Git Automerger
Browse files

am 923a2d16: am 811ad27d: Merge "Disconnect held call when answering third call." into lmp-mr1-dev 

* commit '923a2d16':
  Disconnect held call when answering third call.
parents 1c350b4e 923a2d16

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