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

Commit 77e61abc authored by Joonhun Shin's avatar Joonhun Shin Committed by Android (Google) Code Review
Browse files

Merge "Prevents references to the part in the call termination process before... 

Merge "Prevents references to the part in the call termination process before creating an internal object." into main
parents 5d94e6cf bde0a6f2

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

+1 −1
Original line number Diff line number Diff line
@@ -2884,7 +2884,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        boolean rejectCall = false;



        if (mFeatureFlags.preventHangupDuringCallMerge()) {

            if (imsCall.isCallSessionMergePending()) {

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

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



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