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

Commit b985923b authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by dianlujitao
Browse files

Support for NR radio technology 

- Use method that checks for both LTE and NR radio technologies

CRs-Fixed: 2422797

Change-Id: I849860da29d274065929ef019a4e1682fc193a5c
parent 7e618f41

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

+5 −4
Original line number Diff line number Diff line
@@ -1258,11 +1258,11 @@ public class GsmCdmaPhone extends Phone { 
                "cannot dial voice call in airplane mode");

        }

        // Check for service before placing non emergency CS voice call.

        // Allow dial only if either CS is camped on any RAT (or) PS is in LTE service.

        // Allow dial only if either CS is camped on any RAT (or) PS is in LTE/NR service.

        if (mSST != null

                && mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE /* CS out of service */

                && !(mSST.mSS.getDataRegState() == ServiceState.STATE_IN_SERVICE

                    && ServiceState.isLte(mSST.mSS.getRilDataRadioTechnology())) /* PS not in LTE */

                && ServiceState.isPsTech(mSST.mSS.getRilDataRadioTechnology())) /* PS not in LTE/NR */

                && !VideoProfile.isVideo(dialArgs.videoState) /* voice call */

                && !isEmergency /* non-emergency call */) {

            throw new CallStateException(
@@ -3482,7 +3482,7 @@ public class GsmCdmaPhone extends Phone { 
        logd("phoneObjectUpdater: newVoiceRadioTech=" + newVoiceRadioTech);



        // Check for a voice over lte replacement

        if (ServiceState.isLte(newVoiceRadioTech)

        if (ServiceState.isPsTech(newVoiceRadioTech)

                || (newVoiceRadioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)) {

            CarrierConfigManager configMgr = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -3784,7 +3784,8 @@ public class GsmCdmaPhone extends Phone { 
    private static final int[] VOICE_PS_CALL_RADIO_TECHNOLOGY = {

            ServiceState.RIL_RADIO_TECHNOLOGY_LTE,

            ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,

            ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

            ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN,

            ServiceState.RIL_RADIO_TECHNOLOGY_NR

    };



    /**

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

+13 −12
Original line number Diff line number Diff line
@@ -1853,9 +1853,10 @@ public class ServiceStateTracker extends Handler { 
                        // Use default

                        mNewSS.setCdmaRoamingIndicator(mDefaultRoamingIndicator);

                    } else if (namMatch && !mIsInPrl) {

                        // TODO this will be removed when we handle roaming on LTE on CDMA+LTE phones

                        if (ServiceState.isLte(mNewSS.getRilVoiceRadioTechnology())) {

                            log("Turn off roaming indicator as voice is LTE");

                        // TODO this will be removed when we handle roaming on LTE/NR

                        // on CDMA+LTE phones

                        if (ServiceState.isPsTech(mNewSS.getRilVoiceRadioTechnology())) {

                            log("Turn off roaming indicator as voice is LTE or NR");

                            mNewSS.setCdmaRoamingIndicator(EriInfo.ROAMING_INDICATOR_OFF);

                        } else {

                            mNewSS.setCdmaRoamingIndicator(EriInfo.ROAMING_INDICATOR_FLASH);
@@ -2143,7 +2144,7 @@ public class ServiceStateTracker extends Handler { 
                } else {



                    // If the unsolicited signal strength comes just before data RAT family changes

                    // (i.e. from UNKNOWN to LTE, CDMA to LTE, LTE to CDMA), the signal bar might

                    // (i.e. from UNKNOWN to LTE/NR, CDMA to LTE/NR, LTE/NR to CDMA), the signal bar might

                    // display the wrong information until the next unsolicited signal strength

                    // information coming from the modem, which might take a long time to come or

                    // even not come at all.  In order to provide the best user experience, we
@@ -2151,8 +2152,8 @@ public class ServiceStateTracker extends Handler { 
                    int oldDataRAT = mSS.getRilDataRadioTechnology();

                    if (((oldDataRAT == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)

                            && (newDataRat != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN))

                            || (ServiceState.isCdma(oldDataRAT) && ServiceState.isLte(newDataRat))

                            || (ServiceState.isLte(oldDataRAT)

                            || (ServiceState.isCdma(oldDataRAT) && ServiceState.

                            isPsTech(newDataRat)) || (ServiceState.isPsTech(oldDataRAT)

                            && ServiceState.isCdma(newDataRat))) {

                        mCi.getSignalStrength(obtainMessage(EVENT_GET_SIGNAL_STRENGTH));

                    }
@@ -3133,19 +3134,19 @@ public class ServiceStateTracker extends Handler { 
        boolean hasLostMultiApnSupport = false;

        if (mPhone.isPhoneTypeCdmaLte()) {

            has4gHandoff = mNewSS.getDataRegState() == ServiceState.STATE_IN_SERVICE

                    && ((ServiceState.isLte(mSS.getRilDataRadioTechnology())

                    && ((ServiceState.isPsTech(mSS.getRilDataRadioTechnology())

                    && (mNewSS.getRilDataRadioTechnology()

                    == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

                    ||

                    ((mSS.getRilDataRadioTechnology()

                            == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)

                            && ServiceState.isLte(mNewSS.getRilDataRadioTechnology())));

                            && ServiceState.isPsTech(mNewSS.getRilDataRadioTechnology())));



            hasMultiApnSupport = ((ServiceState.isLte(mNewSS.getRilDataRadioTechnology())

            hasMultiApnSupport = ((ServiceState.isPsTech(mNewSS.getRilDataRadioTechnology())

                    || (mNewSS.getRilDataRadioTechnology()

                    == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

                    &&

                    (!ServiceState.isLte(mSS.getRilDataRadioTechnology())

                    (!ServiceState.isPsTech(mSS.getRilDataRadioTechnology())

                            && (mSS.getRilDataRadioTechnology()

                            != ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)));
@@ -3432,7 +3433,7 @@ public class ServiceStateTracker extends Handler { 
                    mUiccController.getUiccCard(getPhoneId()).getOperatorBrandOverride() != null;

            if (!hasBrandOverride && (mCi.getRadioState() == TelephonyManager.RADIO_POWER_ON)

                    && (mEriManager.isEriFileLoaded())

                    && (!ServiceState.isLte(mSS.getRilVoiceRadioTechnology())

                    && (!ServiceState.isPsTech(mSS.getRilVoiceRadioTechnology())

                    || mPhone.getContext().getResources().getBoolean(com.android.internal.R

                    .bool.config_LTE_eri_for_network_name))) {

                // Only when CDMA is in service, ERI will take effect
@@ -3457,7 +3458,7 @@ public class ServiceStateTracker extends Handler { 


            if (mUiccApplcation != null && mUiccApplcation.getState() == AppState.APPSTATE_READY &&

                    mIccRecords != null && getCombinedRegState(mSS) == ServiceState.STATE_IN_SERVICE

                    && !ServiceState.isLte(mSS.getRilVoiceRadioTechnology())) {

                    && !ServiceState.isPsTech(mSS.getRilVoiceRadioTechnology())) {

                // SIM is found on the device. If ERI roaming is OFF, and SID/NID matches

                // one configured in SIM, use operator name from CSIM record. Note that ERI, SID,

                // and NID are CDMA only, not applicable to LTE.

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

+38 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public class ServiceStateTest extends TestCase { 
        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_GSM, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NR, false));



        for (Pair<Integer, Boolean> rat : rats) {

            boolean isCdma = rat.second;
@@ -411,4 +412,41 @@ public class ServiceStateTest extends TestCase { 


        assertEquals(ss.getDuplexMode(), ServiceState.DUPLEX_MODE_TDD);

    }



    @SmallTest

    public void testIsPsTech() {

        ArrayList<Pair<Integer, Boolean>> rats = new ArrayList<Pair<Integer, Boolean>>();



        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IS95A, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IS95B, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_GPRS, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_EDGE, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_UMTS, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_HSPA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_GSM, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA, false));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN, false));



        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_LTE, true));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA, true));

        rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NR, true));



        for (Pair<Integer, Boolean> rat : rats) {

            boolean isPsTech = rat.second;

            if (isPsTech) {

                assertTrue("RAT " + rat + " should be PsTech", ServiceState.isPsTech(rat.first));

            } else {

                assertFalse("RAT " + rat + " should not be PsTech",

                        ServiceState.isPsTech(rat.first));

            }

        }

    }

}