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

Commit 79de4402 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Enhance logic for determining if answering call will disconnect fg call. 

There is logic to determine if a FG video call should be disconnected
when an audio call is received.  It was missing a check to see if VOWIFI
is enabled.  If VOWIFI is not enabled, then the check applies.  If VOWIFI
is enabled, the check does not apply.

Bug: 28933314
Change-Id: I57ace7583906bddb93f81735809a2e21069da380
parent 0f6c2788

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -2411,9 +2411,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        boolean isActiveCallVideo = activeCall.isVideoCall() ||

        boolean isActiveCallVideo = activeCall.isVideoCall() ||

                (mTreatDowngradedVideoCallsAsVideoCalls && activeCall.wasVideoCall());

                (mTreatDowngradedVideoCallsAsVideoCalls && activeCall.wasVideoCall());

        boolean isActiveCallOnWifi = activeCall.isWifiCall();

        boolean isActiveCallOnWifi = activeCall.isWifiCall();

        boolean isVoWifiEnabled = mImsManager.isWfcEnabledByPlatform(mPhone.getContext()) &&

                mImsManager.isWfcEnabledByUser(mPhone.getContext());

        boolean isIncomingCallAudio = !incomingCall.isVideoCall();

        boolean isIncomingCallAudio = !incomingCall.isVideoCall();





        return isActiveCallVideo && isActiveCallOnWifi && isIncomingCallAudio;

        log("shouldDisconnectActiveCallOnAnswer : isActiveCallVideo=" + isActiveCallVideo +

                " isActiveCallOnWifi=" + isActiveCallOnWifi + " isIncomingCallAudio=" +

                isIncomingCallAudio + " isVowifiEnabled=" + isVoWifiEnabled);



        return isActiveCallVideo && isActiveCallOnWifi && isIncomingCallAudio && !isVoWifiEnabled;

    }

    }





    /** Get aggregated video call data usage since boot.

    /** Get aggregated video call data usage since boot.