Merge "Remove deprecated remote override checks" into mnc-dev (870008cb) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -1143,23 +1143,6 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		log("updateRoamingState: no carrier config service available");
		}

		/* NOTE(Deprecated) This roaming override uses a hidden API and is deprecated */
		if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsNonRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as non-roaming.");
		mNewSS.setVoiceRoaming(false);
		mNewSS.setDataRoaming(false);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);
		} else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as roaming.");
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_ON);
		mNewSS.setCdmaEriIconMode(EriInfo.ROAMING_ICON_MODE_NORMAL);
		}
		/* End Deprecated */

		if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);

+0 −8

Original line number	Diff line number	Diff line
		@@ -896,14 +896,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
		log("updateRoamingState: no carrier config service available");
		}

		/* NOTE(Deprecated) This roaming override uses a hidden API and is deprecated */
		if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric())) {
		roaming = false;
		} else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric())) {
		roaming = true;
		}
		/* End Deprecated */

		mNewSS.setVoiceRoaming(roaming);
		mNewSS.setDataRoaming(roaming);
		}