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

Commit c38393d6 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Unhold other call after local disconnect of active call" into nyc-dev

parents 5851fa01 2a3455b9

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

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ public class CallAudioManager extends CallsManagerListenerBase { 
        return mCallAudioRouteStateMachine.getCurrentCallAudioState();

    }



    public Call getPossiblyHeldForegroundCall() {

        return mForegroundCall;

    }



    public Call getForegroundCall() {

        if (mForegroundCall != null && mForegroundCall.getState() != CallState.ON_HOLD) {

            return mForegroundCall;

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

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ public class CallsManager extends Call.ListenerBase 
        removeCall(call);

        if (mLocallyDisconnectingCalls.contains(call)) {

            mLocallyDisconnectingCalls.remove(call);

            Call foregroundCall = getForegroundCall();

            Call foregroundCall = mCallAudioManager.getPossiblyHeldForegroundCall();

            if (foregroundCall != null && foregroundCall.getState() == CallState.ON_HOLD) {

                foregroundCall.unhold();

            }