Merge "Renamed getNetworkId and getSystemId" (b01be416) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1635,7 +1635,7 @@ public class ServiceStateTracker extends Handler {
	mNewSS.setEmergencyOnly(mEmergencyOnly);		mNewSS.setEmergencyOnly(mEmergencyOnly);
	} else {		} else {
	boolean namMatch = false;		boolean namMatch = false;
	if (!isSidsAllZeros() && isHomeSid(mNewSS.getSystemId())) {		if (!isSidsAllZeros() && isHomeSid(mNewSS.getCdmaSystemId())) {
	namMatch = true;		namMatch = true;
	}		}

	@@ -1811,7 +1811,7 @@ public class ServiceStateTracker extends Handler {
	systemId = ((CellIdentityCdma) cellIdentity).getSystemId();		systemId = ((CellIdentityCdma) cellIdentity).getSystemId();
	networkId = ((CellIdentityCdma) cellIdentity).getNetworkId();		networkId = ((CellIdentityCdma) cellIdentity).getNetworkId();
	}		}
	mNewSS.setSystemAndNetworkId(systemId, networkId);		mNewSS.setCdmaSystemAndNetworkId(systemId, networkId);

	if (reasonForDenial == 0) {		if (reasonForDenial == 0) {
	mRegistrationDeniedReason = ServiceStateTracker.REGISTRATION_DENIED_GEN;		mRegistrationDeniedReason = ServiceStateTracker.REGISTRATION_DENIED_GEN;
	@@ -2093,7 +2093,7 @@ public class ServiceStateTracker extends Handler {
	if (configLoader != null) {		if (configLoader != null) {
	try {		try {
	PersistableBundle b = configLoader.getConfigForSubId(mPhone.getSubId());		PersistableBundle b = configLoader.getConfigForSubId(mPhone.getSubId());
	String systemId = Integer.toString(mNewSS.getSystemId());		String systemId = Integer.toString(mNewSS.getCdmaSystemId());

	if (alwaysOnHomeNetwork(b)) {		if (alwaysOnHomeNetwork(b)) {
	log("updateRoamingState: carrier config override always on home network");		log("updateRoamingState: carrier config override always on home network");
	@@ -2827,7 +2827,7 @@ public class ServiceStateTracker extends Handler {
	if (!mPhone.isPhoneTypeGsm()) {		if (!mPhone.isPhoneTypeGsm()) {
	// try to fix the invalid Operator Numeric		// try to fix the invalid Operator Numeric
	if (isInvalidOperatorNumeric(operatorNumeric)) {		if (isInvalidOperatorNumeric(operatorNumeric)) {
	int sid = mSS.getSystemId();		int sid = mSS.getCdmaSystemId();
	operatorNumeric = fixUnknownMcc(operatorNumeric, sid);		operatorNumeric = fixUnknownMcc(operatorNumeric, sid);
	}		}
	}		}
	@@ -3025,9 +3025,9 @@ public class ServiceStateTracker extends Handler {
	((RuimRecords) mIccRecords).getCsimSpnDisplayCondition();		((RuimRecords) mIccRecords).getCsimSpnDisplayCondition();
	int iconIndex = mSS.getCdmaEriIconIndex();		int iconIndex = mSS.getCdmaEriIconIndex();

	if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF) &&		if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF)
	isInHomeSidNid(mSS.getSystemId(), mSS.getNetworkId()) &&		&& isInHomeSidNid(mSS.getCdmaSystemId(), mSS.getCdmaNetworkId())
	mIccRecords != null) {		&& mIccRecords != null) {
	mSS.setOperatorAlphaLong(mIccRecords.getServiceProviderName());		mSS.setOperatorAlphaLong(mIccRecords.getServiceProviderName());
	}		}
	}		}

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

+5 −5

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

	ss.setSystemAndNetworkId(123, 456);		ss.setCdmaSystemAndNetworkId(123, 456);
	assertEquals(123, ss.getSystemId());		assertEquals(123, ss.getCdmaSystemId());
	assertEquals(456, ss.getNetworkId());		assertEquals(456, ss.getCdmaNetworkId());

	ss.setEmergencyOnly(true);		ss.setEmergencyOnly(true);
	assertTrue(ss.isEmergencyOnly());		assertTrue(ss.isEmergencyOnly());
	@@ -220,7 +220,7 @@ public class ServiceStateTest extends TestCase {
	ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);		ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);
	ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);		ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);
	ss.setCssIndicator(1);		ss.setCssIndicator(1);
	ss.setSystemAndNetworkId(2, 3);		ss.setCdmaSystemAndNetworkId(2, 3);
	ss.setCdmaRoamingIndicator(4);		ss.setCdmaRoamingIndicator(4);
	ss.setCdmaDefaultRoamingIndicator(5);		ss.setCdmaDefaultRoamingIndicator(5);
	ss.setCdmaEriIconIndex(6);		ss.setCdmaEriIconIndex(6);
	@@ -250,7 +250,7 @@ public class ServiceStateTest extends TestCase {
	ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);		ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);
	ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);		ss.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0);
	ss.setCssIndicator(1);		ss.setCssIndicator(1);
	ss.setSystemAndNetworkId(2, 3);		ss.setCdmaSystemAndNetworkId(2, 3);
	ss.setCdmaRoamingIndicator(4);		ss.setCdmaRoamingIndicator(4);
	ss.setCdmaDefaultRoamingIndicator(5);		ss.setCdmaDefaultRoamingIndicator(5);
	ss.setCdmaEriIconIndex(6);		ss.setCdmaEriIconIndex(6);