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

Commit 5bea3c61 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix the call is soundless due another call is active" am: 73ae8d85... 

Merge "Fix the call is soundless due another call is active" am: 73ae8d85 am: 83bfbf04 am: 8cd68fc4

Change-Id: If7c2c81549dbd3878ac7c5f284339276e2c9a900
parents 641d60bf 8cd68fc4

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

+5 −0
Original line number Diff line number Diff line
@@ -2501,6 +2501,11 @@ public class CallsManager extends Call.ListenerBase 
        if (!mCalls.contains(call)) {

            Log.w(this, "Unknown call (%s) asked to be removed from hold", call);

        } else {

            if (getOutgoingCall() != null) {

                Log.w(this, "There is an outgoing call, so it is unable to unhold this call %s",

                        call);

                return;

            }

            Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();

            String activeCallId = null;

            if (activeCall != null && !activeCall.isLocallyDisconnecting()) {