Merge "Revert "Allow orerride non roaming according carrier configuration for both"" (146ee07f) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -2387,16 +2387,21 @@ public class ServiceStateTracker extends Handler {
		* is set to roaming when either is true.
		*
		* There are exceptions for the above rule.
		* The new SS is not set as roaming while gsm service or
		* data service reports roaming but indeed it is same
		* operator. And the operator is considered non roaming.
		* The new SS is not set as roaming while gsm service reports
		* roaming but indeed it is same operator.
		* And the operator is considered non roaming.
		*
		* The test for the operators is to handle special roaming
		* agreements and MVNO's.
		*/
		boolean roaming = (mGsmRoaming \|\| mDataRoaming);

		if (roaming && !isOperatorConsideredRoaming(mNewSS)
		// for IWLAN case, data is home. Only check voice roaming.
		if (mNewSS.getRilDataRadioTechnology() == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN) {
		roaming = mGsmRoaming;
		}

		if (mGsmRoaming && !isOperatorConsideredRoaming(mNewSS)
		&& (isSameNamedOperators(mNewSS) \|\| isOperatorConsideredNonRoaming(mNewSS))) {
		log("updateRoamingState: resource override set non roaming.isSameNamedOperators="
		+ isSameNamedOperators(mNewSS) + ",isOperatorConsideredNonRoaming="