Merge "Set country code even when device is not registered on network" am: fc9bc10d69 (79f5b2e7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -7114,31 +7114,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set the ISO country code equivalent of the current registered
		* operator's MCC (Mobile Country Code).
		* @param iso the ISO country code equivalent of the current registered
		* @hide
		*/
		public void setNetworkCountryIso(String iso) {
		int phoneId = getPhoneId();
		setNetworkCountryIsoForPhone(phoneId, iso);
		}

		/**
		* Set the ISO country code equivalent of the current registered
		* operator's MCC (Mobile Country Code).
		* @param phoneId which phone you want to set
		* @param iso the ISO country code equivalent of the current registered
		* @hide
		*/
		public void setNetworkCountryIsoForPhone(int phoneId, String iso) {
		if (SubscriptionManager.isValidPhoneId(phoneId)) {
		setTelephonyProperty(phoneId,
		TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, iso);
		}
		}

		/**
		* Set the network type currently in use on the device for data transmission.
		*