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

Commit 3ef6f17e authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Signal disconnect failure during merge" into main

parents f3fe3bcf 5aed26c5

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -2886,7 +2886,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        if (mFeatureFlags.preventHangupDuringCallMerge()) {

            if (imsCall != null && imsCall.isCallSessionMergePending()) {

                if (DBG) log("hangup call failed during call merge");



                // Notify Telecom that the disconnect failed due to an ongoing call merge.

                if (conn != null && mTelecomFlags.revertDisconnectingDuringMerge()) {

                    conn.onConnectionEvent(android.telecom.Connection.EVENT_DISCONNECT_FAILED,

                            null);

                }

                throw new CallStateException("can not hangup during call merge");

            }

        }