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

Commit e5a04145 authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by Toshiya Ikenaga
Browse files

Add Dual Transfer Mode support 

This change includes the following to support DTM:
(1) For GSM, decode the "concurrent services support indicator" field
from RIL_REQUEST_VOICE_REGISTRATION_STATE request and based on the
value of this CSSI field allow concurrent CS and PS services to
applications.

(2) Notify data connection changed on CSS indicator update.

(3) When the phone moves from a DTM cell to a non DTM cell while in
active voice call, data connection is not suspended. To fix this,
consider CSS indicator change also for notifying data connection.

(4) To determine concurrent voice and data support, it is necessary to
query Data Radio Tech.

Test: with modified RIL to return desired css indicator
Test: Passed new unit test
Bug: 21079150

Change-Id: I57c445ee28be4e1c0f2934cb136a70d39447511c
parent 3a085047

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

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public interface PhoneInternalInterface { 
    static final String REASON_CARRIER_CHANGE = "carrierChange";

    static final String REASON_CARRIER_ACTION_DISABLE_METERED_APN =

            "carrierActionDisableMeteredApn";

    static final String REASON_CSS_INDICATOR_CHANGED = "cssIndicatorChanged";



    // Used for band mode selection methods

    static final int BM_UNSPECIFIED = RILConstants.BAND_MODE_UNSPECIFIED; // automatic

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

+17 −13
Original line number Diff line number Diff line
@@ -1805,8 +1805,10 @@ public class ServiceStateTracker extends Handler { 
            case EVENT_POLL_STATE_REGISTRATION: {

                VoiceRegStateResult voiceRegStateResult = (VoiceRegStateResult) ar.result;

                int registrationState = getRegStateFromHalRegState(voiceRegStateResult.regState);

                int cssIndicator = voiceRegStateResult.cssSupported ? 1 : 0;



                mNewSS.setVoiceRegState(regCodeToServiceState(registrationState));

                mNewSS.setCssIndicator(cssIndicator);

                mNewSS.setRilVoiceRadioTechnology(voiceRegStateResult.rat);



                //Denial reason if registrationState = 3
@@ -1832,8 +1834,6 @@ public class ServiceStateTracker extends Handler { 
                        mEmergencyOnly = false;

                    }

                } else {

                    //init with 0, because it is treated as a boolean

                    int cssIndicator = voiceRegStateResult.cssSupported ? 1 : 0;

                    int roamingIndicator = voiceRegStateResult.roamingIndicator;



                    //Indicates if current system is in PR
@@ -1851,7 +1851,6 @@ public class ServiceStateTracker extends Handler { 
                                    && !isRoamIndForHomeSystem(

                                            Integer.toString(roamingIndicator));

                    mNewSS.setVoiceRoaming(cdmaRoaming);

                    mNewSS.setCssIndicator(cssIndicator);

                    mRoamingIndicator = roamingIndicator;

                    mIsInPrl = (systemIsInPrl == 0) ? false : true;

                    mDefaultRoamingIndicator = defaultRoamingIndicator;
@@ -2508,16 +2507,13 @@ public class ServiceStateTracker extends Handler { 
     * that could support voice and data simultaneously.

     */

    public boolean isConcurrentVoiceAndDataAllowed() {

        if (mPhone.isPhoneTypeGsm()) {

            return (mSS.getRilVoiceRadioTechnology() >= ServiceState.RIL_RADIO_TECHNOLOGY_UMTS);

        } else if (mPhone.isPhoneTypeCdma()) {

            // Note: it needs to be confirmed which CDMA network types

            // can support voice and data calls concurrently.

            // For the time-being, the return value will be false.

            return false;

        if (mSS.getCssIndicator() == 1) {

            // Checking the Concurrent Service Supported flag first for all phone types.

            return true;

        } else if (mPhone.isPhoneTypeGsm()) {

            return (mSS.getRilDataRadioTechnology() >= ServiceState.RIL_RADIO_TECHNOLOGY_UMTS);

        } else {

            // Using the Conncurrent Service Supported flag for CdmaLte devices.

            return mSS.getCssIndicator() == 1;

            return false;

        }

    }
@@ -2690,6 +2686,8 @@ public class ServiceStateTracker extends Handler { 


        boolean hasRejectCauseChanged = mRejectCode != mNewRejectCode;



        boolean hasCssIndicatorChanged = (mSS.getCssIndicator() != mNewSS.getCssIndicator());



        boolean has4gHandoff = false;

        boolean hasMultiApnSupport = false;

        boolean hasLostMultiApnSupport = false;
@@ -2735,7 +2733,8 @@ public class ServiceStateTracker extends Handler { 
                    + " hasLocationChanged=" + hasLocationChanged

                    + " has4gHandoff = " + has4gHandoff

                    + " hasMultiApnSupport=" + hasMultiApnSupport

                    + " hasLostMultiApnSupport=" + hasLostMultiApnSupport);

                    + " hasLostMultiApnSupport=" + hasLostMultiApnSupport

                    + " hasCssIndicatorChanged=" + hasCssIndicatorChanged);

        }



        // Add an event log when connection state changes
@@ -2770,6 +2769,11 @@ public class ServiceStateTracker extends Handler { 
                            mNewSS.getRilVoiceRadioTechnology()) + " at cell " + cid);

                }

            }



            if (hasCssIndicatorChanged) {

                mPhone.notifyDataConnection(Phone.REASON_CSS_INDICATOR_CHANGED);

            }



            mReasonDataDenied = mNewReasonDataDenied;

            mMaxDataCalls = mNewMaxDataCalls;

            mRejectCode = mNewRejectCode;

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+8 −10
Original line number Diff line number Diff line
@@ -1049,21 +1049,19 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testIsConcurrentVoiceAndDataAllowed() {

        // Verify all 3 branches in the function isConcurrentVoiceAndDataAllowed

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        sst.mSS.setRilVoiceRadioTechnology(sst.mSS.RIL_RADIO_TECHNOLOGY_HSPA);

        assertEquals(true, sst.isConcurrentVoiceAndDataAllowed());



        doReturn(false).when(mPhone).isPhoneTypeGsm();

        doReturn(true).when(mPhone).isPhoneTypeCdma();

        assertEquals(false, sst.isConcurrentVoiceAndDataAllowed());



        doReturn(false).when(mPhone).isPhoneTypeGsm();

        doReturn(false).when(mPhone).isPhoneTypeCdma();

        sst.mSS.setCssIndicator(1);

        assertEquals(true, sst.isConcurrentVoiceAndDataAllowed());

        sst.mSS.setCssIndicator(0);

        assertEquals(false, sst.isConcurrentVoiceAndDataAllowed());



        doReturn(true).when(mPhone).isPhoneTypeGsm();

        sst.mSS.setRilDataRadioTechnology(sst.mSS.RIL_RADIO_TECHNOLOGY_HSPA);

        assertEquals(true, sst.isConcurrentVoiceAndDataAllowed());

        sst.mSS.setRilDataRadioTechnology(sst.mSS.RIL_RADIO_TECHNOLOGY_GPRS);

        assertEquals(false, sst.isConcurrentVoiceAndDataAllowed());

        sst.mSS.setCssIndicator(1);

        assertEquals(true, sst.isConcurrentVoiceAndDataAllowed());

    }



    @Test