Merge "Fixed the incorrect roaming override" (5a824371) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -2060,8 +2060,11 @@ public class ServiceStateTracker extends Handler {
		// carrier config possibly overrides it.
		mNewSS.setDataRoamingFromRegistration(roaming);

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

		@@ -3308,7 +3311,7 @@ public class ServiceStateTracker extends Handler {
		}

		for (String numeric : numericArray) {
		if (operatorNumeric.startsWith(numeric)) {
		if (!TextUtils.isEmpty(numeric) && operatorNumeric.startsWith(numeric)) {
		return true;
		}
		}
		@@ -3332,7 +3335,7 @@ public class ServiceStateTracker extends Handler {
		}

		for (String numeric : numericArray) {
		if (operatorNumeric.startsWith(numeric)) {
		if (!TextUtils.isEmpty(numeric) && operatorNumeric.startsWith(numeric)) {
		return true;
		}
		}