Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev (915dfa42) · Commits · e / os / android_frameworks_opt_telephony

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

+37 −18

Original line number	Diff line number	Diff line
		@@ -1649,7 +1649,13 @@ public class ServiceStateTracker extends Handler {

		// Setting SS Roaming (general)
		if (mIsSubscriptionFromRuim) {
		mNewSS.setVoiceRoaming(isRoamingBetweenOperators(mNewSS.getVoiceRoaming(), mNewSS));
		boolean isRoamingBetweenOperators = isRoamingBetweenOperators(
		mNewSS.getVoiceRoaming(), mNewSS);
		if (isRoamingBetweenOperators != mNewSS.getVoiceRoaming()) {
		log("isRoamingBetweenOperators=" + isRoamingBetweenOperators
		+ ". Override CDMA voice roaming to " + isRoamingBetweenOperators);
		mNewSS.setVoiceRoaming(isRoamingBetweenOperators);
		}
		}
		/**
		* For CDMA, voice and data should have the same roaming status.
		@@ -1662,15 +1668,25 @@ public class ServiceStateTracker extends Handler {
		final boolean isVoiceInService =
		(mNewSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE);
		if (isVoiceInService) {
		mNewSS.setDataRoaming(mNewSS.getVoiceRoaming());
		boolean isVoiceRoaming = mNewSS.getVoiceRoaming();
		if (mNewSS.getDataRoaming() != isVoiceRoaming) {
		log("Data roaming != Voice roaming. Override data roaming to "
		+ isVoiceRoaming);
		mNewSS.setDataRoaming(isVoiceRoaming);
		}
		} else {
		/**
		* As per VoiceRegStateResult from radio types.hal the TSB58
		* Roaming Indicator shall be sent if device is registered
		* on a CDMA or EVDO system.
		*/
		mNewSS.setDataRoaming(
		!isRoamIndForHomeSystem(Integer.toString(mRoamingIndicator)));
		boolean isRoamIndForHomeSystem = isRoamIndForHomeSystem(
		Integer.toString(mRoamingIndicator));
		if (mNewSS.getDataRoaming() == isRoamIndForHomeSystem) {
		log("isRoamIndForHomeSystem=" + isRoamIndForHomeSystem
		+ ", override data roaming to " + !isRoamIndForHomeSystem);
		mNewSS.setDataRoaming(!isRoamIndForHomeSystem);
		}
		}
		}

		@@ -1875,6 +1891,9 @@ public class ServiceStateTracker extends Handler {
		mNewReasonDataDenied = dataRegStateResult.reasonDataDenied;
		mNewMaxDataCalls = dataRegStateResult.maxDataCalls;
		mDataRoaming = regCodeIsRoaming(regState);
		// Save the data roaming state reported by modem registration before resource
		// overlay or carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(mDataRoaming);

		if (DBG) {
		log("handlPollStateResultMessage: GsmSST setDataRegState=" + dataRegState
		@@ -1883,7 +1902,11 @@ public class ServiceStateTracker extends Handler {
		}
		} else if (mPhone.isPhoneTypeCdma()) {

		mNewSS.setDataRoaming(regCodeIsRoaming(regState));
		boolean isDataRoaming = regCodeIsRoaming(regState);
		mNewSS.setDataRoaming(isDataRoaming);
		// Save the data roaming state reported by modem registration before resource
		// overlay or carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(isDataRoaming);

		if (DBG) {
		log("handlPollStateResultMessage: cdma setDataRegState=" + dataRegState
		@@ -1908,11 +1931,15 @@ public class ServiceStateTracker extends Handler {
		}

		// voice roaming state in done while handling EVENT_POLL_STATE_REGISTRATION_CDMA
		mNewSS.setDataRoaming(regCodeIsRoaming(regState));
		boolean isDataRoaming = regCodeIsRoaming(regState);
		mNewSS.setDataRoaming(isDataRoaming);
		// Save the data roaming state reported by modem registration before resource
		// overlay or carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(isDataRoaming);
		if (DBG) {
		log("handlPollStateResultMessage: CdmaLteSST setDataRegState=" + dataRegState
		+ " regState=" + regState
		+ " dataRadioTechnology=" + newDataRat);
		log("handlPollStateResultMessage: CdmaLteSST setDataRegState="
		+ dataRegState + " regState=" + regState + " dataRadioTechnology="
		+ newDataRat);
		}
		}

		@@ -2002,10 +2029,9 @@ public class ServiceStateTracker extends Handler {
		*/
		private boolean isRoamIndForHomeSystem(String roamInd) {
		// retrieve the carrier-specified list of ERIs for home system
		log("isRoamIndForHomeSystem: " + Resources.getSystem()
		.getConfiguration().toString());
		String[] homeRoamIndicators = Resources.getSystem()
		.getStringArray(com.android.internal.R.array.config_cdma_home_system);
		log("isRoamIndForHomeSystem: homeRoamIndicators=" + Arrays.toString(homeRoamIndicators));

		if (homeRoamIndicators != null) {
		// searches through the comma-separated list for a match,
		@@ -2046,10 +2072,6 @@ public class ServiceStateTracker extends Handler {
		*/
		boolean roaming = (mGsmRoaming \|\| mDataRoaming);

		// Save the data roaming state reported by modem registration before resource overlay or
		// carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(roaming);

		if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS)
		&& (isSameNamedOperators(mNewSS) \|\| isOperatorConsideredNonRoaming(mNewSS))) {
		log("updateRoamingState: resource override set non roaming.isSameNamedOperators="
		@@ -2087,9 +2109,6 @@ public class ServiceStateTracker extends Handler {
		mNewSS.setVoiceRoaming(roaming);
		mNewSS.setDataRoaming(roaming);
		} else {
		// Save the roaming state before carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(mNewSS.getDataRoaming());

		CarrierConfigManager configLoader = (CarrierConfigManager)
		mPhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
		if (configLoader != null) {