Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 (0fed7e32) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -1628,7 +1628,8 @@ public class TelephonyManager {
		* @hide
		*/
		public String getNetworkCountryIso(int subId) {
		return getNetworkCountryIsoForPhone(getPhoneId(subId));
		int phoneId = SubscriptionManager.getPhoneId(subId);
		return getNetworkCountryIsoForPhone(phoneId);
		}

		/**
		@@ -1643,14 +1644,7 @@ public class TelephonyManager {
		*/
		/** {@hide} */
		public String getNetworkCountryIsoForPhone(int phoneId) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return "";
		return telephony.getNetworkCountryIsoForPhone(phoneId);
		} catch (RemoteException ex) {
		return "";
		}
		return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
		}

		/** Network type is unknown */

+0 −7

Original line number	Diff line number	Diff line
		@@ -376,13 +376,6 @@ interface ITelephony {

		Bundle getCellLocation(String callingPkg);

		/**
		* Returns the ISO country code equivalent of the current registered
		* operator's MCC (Mobile Country Code).
		* @see android.telephony.TelephonyManager#getNetworkCountryIso
		*/
		String getNetworkCountryIsoForPhone(int phoneId);

		/**
		* Returns the neighboring cell information of the device.
		*/