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

Commit b604c85c authored by Jack Yu's avatar Jack Yu
Browse files

Renamed getNetworkId and getSystemId 

1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Merged-In: Iafd330a270de128deec43d24f5047bdd704bc452
Change-Id: Iafd330a270de128deec43d24f5047bdd704bc452
(cherry picked from commit cb209509)
parent fad80ac2

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

+7 −7
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ public class ServiceStateTracker extends Handler { 
                mNewSS.setEmergencyOnly(mEmergencyOnly);

            } else {

                boolean namMatch = false;

                if (!isSidsAllZeros() && isHomeSid(mNewSS.getSystemId())) {

                if (!isSidsAllZeros() && isHomeSid(mNewSS.getCdmaSystemId())) {

                    namMatch = true;

                }
@@ -1810,7 +1810,7 @@ public class ServiceStateTracker extends Handler { 
                        systemId = ((CellIdentityCdma) cellIdentity).getSystemId();

                        networkId = ((CellIdentityCdma) cellIdentity).getNetworkId();

                    }

                    mNewSS.setSystemAndNetworkId(systemId, networkId);

                    mNewSS.setCdmaSystemAndNetworkId(systemId, networkId);



                    if (reasonForDenial == 0) {

                        mRegistrationDeniedReason = ServiceStateTracker.REGISTRATION_DENIED_GEN;
@@ -2092,7 +2092,7 @@ public class ServiceStateTracker extends Handler { 
            if (configLoader != null) {

                try {

                    PersistableBundle b = configLoader.getConfigForSubId(mPhone.getSubId());

                    String systemId = Integer.toString(mNewSS.getSystemId());

                    String systemId = Integer.toString(mNewSS.getCdmaSystemId());



                    if (alwaysOnHomeNetwork(b)) {

                        log("updateRoamingState: carrier config override always on home network");
@@ -2826,7 +2826,7 @@ public class ServiceStateTracker extends Handler { 
            if (!mPhone.isPhoneTypeGsm()) {

                // try to fix the invalid Operator Numeric

                if (isInvalidOperatorNumeric(operatorNumeric)) {

                    int sid = mSS.getSystemId();

                    int sid = mSS.getCdmaSystemId();

                    operatorNumeric = fixUnknownMcc(operatorNumeric, sid);

                }

            }
@@ -3024,9 +3024,9 @@ public class ServiceStateTracker extends Handler { 
                        ((RuimRecords) mIccRecords).getCsimSpnDisplayCondition();

                int iconIndex = mSS.getCdmaEriIconIndex();



                if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF) &&

                        isInHomeSidNid(mSS.getSystemId(), mSS.getNetworkId()) &&

                        mIccRecords != null) {

                if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF)

                        && isInHomeSidNid(mSS.getCdmaSystemId(), mSS.getCdmaNetworkId())

                        && mIccRecords != null) {

                    mSS.setOperatorAlphaLong(mIccRecords.getServiceProviderName());

                }

            }

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

+5 −5
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ public class ServiceStateTest extends TestCase { 
        ss.setIsManualSelection(true);

        assertTrue(ss.getIsManualSelection());



        ss.setSystemAndNetworkId(123, 456);

        assertEquals(123, ss.getSystemId());

        assertEquals(456, ss.getNetworkId());

        ss.setCdmaSystemAndNetworkId(123, 456);

        assertEquals(123, ss.getCdmaSystemId());

        assertEquals(456, ss.getCdmaNetworkId());



        ss.setEmergencyOnly(true);

        assertTrue(ss.isEmergencyOnly());
@@ -220,7 +220,7 @@ public class ServiceStateTest extends TestCase { 
        ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);

        ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);

        ss.setCssIndicator(1);

        ss.setSystemAndNetworkId(2, 3);

        ss.setCdmaSystemAndNetworkId(2, 3);

        ss.setCdmaRoamingIndicator(4);

        ss.setCdmaDefaultRoamingIndicator(5);

        ss.setCdmaEriIconIndex(6);
@@ -250,7 +250,7 @@ public class ServiceStateTest extends TestCase { 
        ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);

        ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);

        ss.setCssIndicator(1);

        ss.setSystemAndNetworkId(2, 3);

        ss.setCdmaSystemAndNetworkId(2, 3);

        ss.setCdmaRoamingIndicator(4);

        ss.setCdmaDefaultRoamingIndicator(5);

        ss.setCdmaEriIconIndex(6);