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

Commit c0b7fdb0 authored by mavishsu's avatar mavishsu Committed by Jack Yu
Browse files

DUT can not show carrier name correctly. 

ServiceState.getRilDataRadioTechnology() will combine both IWLAN and
WWAN. For some cases, we shall only condiser WWAN.

Bug: 135072425
Test: atest ServiceStateTrackerTest
Merged-In: Ia76c081085d9083cb9b8e3d15d5992676e9e2836
Change-Id: Ia76c081085d9083cb9b8e3d15d5992676e9e2836
parent 991513db

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

+14 −19
Original line number Diff line number Diff line
@@ -2180,7 +2180,7 @@ public class ServiceStateTracker extends Handler { 
                    // 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

                    // query the latest signal information so it will show up on the UI on time.

                    int oldDataRAT = mSS.getRilDataRadioTechnology();

                    int oldDataRAT = getRilDataRadioTechnologyForWwan(mSS);

                    if (((oldDataRAT == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)

                            && (newDataRat != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN))

                            || (ServiceState.isCdma(oldDataRAT) && ServiceState.isLte(newDataRat))
@@ -3200,28 +3200,23 @@ public class ServiceStateTracker extends Handler { 
        boolean hasMultiApnSupport = false;

        boolean hasLostMultiApnSupport = false;

        if (mPhone.isPhoneTypeCdmaLte()) {

            final int wwanDataRat = getRilDataRadioTechnologyForWwan(mSS);

            final int newWwanDataRat = getRilDataRadioTechnologyForWwan(mNewSS);

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

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

                    && (mNewSS.getRilDataRadioTechnology()

                    == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

                    && ((ServiceState.isLte(wwanDataRat)

                    && (newWwanDataRat == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

                    ||

                    ((mSS.getRilDataRadioTechnology()

                            == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)

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

                    ((wwanDataRat == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)

                    && ServiceState.isLte(newWwanDataRat)));



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

                    || (mNewSS.getRilDataRadioTechnology()

                    == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

            hasMultiApnSupport = ((ServiceState.isLte(newWwanDataRat)

                    || (newWwanDataRat == ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD))

                    &&

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

                            && (mSS.getRilDataRadioTechnology()

                            != ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)));



            hasLostMultiApnSupport =

                    ((mNewSS.getRilDataRadioTechnology()

                            >= ServiceState.RIL_RADIO_TECHNOLOGY_IS95A)

                            && (mNewSS.getRilDataRadioTechnology()

                            <= ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A));

                    (!ServiceState.isLte(wwanDataRat)

                    && (wwanDataRat != ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD)));



            hasLostMultiApnSupport = ((newWwanDataRat >= ServiceState.RIL_RADIO_TECHNOLOGY_IS95A)

                    && (newWwanDataRat <= ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A));

        }



        if (DBG) {