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

Commit 317c5ab3 authored by Ravi Paluri's avatar Ravi Paluri
Browse files

IMS-VT: Add support that controls holding a video call 

Fail the request to dial video call if there exists either a
active VoLTE call or a hold VoLTE call

Test: Manual
Bug: 67031055
Change-Id: I552c1179f297cf5c5df0c3bd41b1f907504a741b
parent f32ebb8b

src/java/com/android/internal/telephony/Connection.java

+9 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ public abstract class Connection { 
    private int mPhoneType;

    private boolean mAnsweringDisconnectsActiveCall;

    private boolean mAllowAddCallDuringVideoCall;

    private boolean mAllowHoldingVideoCall;



    private boolean mIsEmergencyCall;
@@ -1079,6 +1080,14 @@ public abstract class Connection { 
        mAllowAddCallDuringVideoCall = allowAddCallDuringVideoCall;

    }



    public boolean shouldAllowHoldingVideoCall() {

        return mAllowHoldingVideoCall;

    }



    public void setAllowHoldingVideoCall(boolean allowHoldingVideoCall) {

        mAllowHoldingVideoCall = allowHoldingVideoCall;

    }



    /**

     * Sets whether the connection is the result of an external call which was pulled to the local

     * device.

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

+34 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    }

                }

                conn.setAllowAddCallDuringVideoCall(mAllowAddCallDuringVideoCall);

                conn.setAllowHoldingVideoCall(mAllowHoldingVideoCall);

                addConnection(conn);



                setVideoCallProvider(conn, imsCall);
@@ -467,6 +468,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
     */

    private boolean mAllowAddCallDuringVideoCall = true;



    /**

     * Carrier configuration option which determines whether holding a video call

     * should be allowed.

     */

    private boolean mAllowHoldingVideoCall = true;



    /**

     * Carrier configuration option which determines whether to notify the connection if a handover

     * to wifi fails.
@@ -828,6 +835,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        // if there is.

        checkForDialIssues();



        if (!canAddVideoCallDuringImsAudioCall(videoState)) {

            throw new CallStateException("cannot dial in current state");

        }



        if (isPhoneInEcmMode && isEmergencyNumber) {

            handleEcmTimer(ImsPhone.CANCEL_ECM_TIMER);

        }
@@ -1013,6 +1024,9 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mAllowAddCallDuringVideoCall =

                carrierConfig.getBoolean(

                        CarrierConfigManager.KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL);

        mAllowHoldingVideoCall =

                carrierConfig.getBoolean(

                        CarrierConfigManager.KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL);

        mNotifyVtHandoverToWifiFail = carrierConfig.getBoolean(

                CarrierConfigManager.KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL);

        mSupportDowngradeVtToAudio = carrierConfig.getBoolean(
@@ -1154,6 +1168,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


            setVideoCallProvider(conn, imsCall);

            conn.setAllowAddCallDuringVideoCall(mAllowAddCallDuringVideoCall);

            conn.setAllowHoldingVideoCall(mAllowHoldingVideoCall);

        } catch (ImsException e) {

            loge("dialInternal : " + e);

            mOperationLocalLog.log("dialInternal exception: " + e);
@@ -1559,6 +1574,25 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            && !mForegroundCall.isFull();

    }



    private boolean canAddVideoCallDuringImsAudioCall(int videoState) {

        if (mAllowHoldingVideoCall) {

            return true;

        }



        ImsCall call = mForegroundCall.getImsCall();

        if (call == null) {

            call = mBackgroundCall.getImsCall();

        }



        boolean isImsAudioCallActiveOrHolding = (mForegroundCall.getState() == Call.State.ACTIVE ||

               mBackgroundCall.getState() == Call.State.HOLDING) && call != null &&

               !call.isVideoCall();



        /* return TRUE if there doesn't exist ims audio call in either active

           or hold states */

        return !isImsAudioCallActiveOrHolding || !VideoProfile.isVideo(videoState);

    }



    /**

     * Determines if there are issues which would preclude dialing an outgoing call.  Throws a

     * {@link CallStateException} if there is an issue.