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

Commit 431f50d7 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bc 

am: 84835fe2

Change-Id: Ic81cfcf837a83f63c5df70cd7e5b5ff3093f9a3c
parents 24baac51 84835fe2

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

+4 −0
Original line number Diff line number Diff line
@@ -2972,6 +2972,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
    private boolean shouldDisconnectActiveCallOnAnswer(ImsCall activeCall,

            ImsCall incomingCall) {



        if (activeCall == null || incomingCall == null) {

            return false;

        }



        if (!mDropVideoCallWhenAnsweringAudioCall) {

            return false;

        }