Merge "Set country code even when device is not registered on network"
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 9de18ff..f846762 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1810,24 +1810,23 @@
}
/**
- * Returns the ISO country code equivalent of the current registered
- * operator's MCC (Mobile Country Code).
+ * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
+ * registered operator, or nearby cell information if not registered.
+ * .
* <p>
- * Availability: Only when user is registered to a network. Result may be
- * unreliable on CDMA networks (use {@link #getPhoneType()} to determine if
- * on a CDMA network).
+ * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
+ * if on a CDMA network).
*/
public String getNetworkCountryIso() {
return getNetworkCountryIsoForPhone(getPhoneId());
}
/**
- * Returns the ISO country code equivalent of the current registered
- * operator's MCC (Mobile Country Code) of a subscription.
+ * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
+ * registered operator, or nearby cell information if not registered.
* <p>
- * Availability: Only when user is registered to a network. Result may be
- * unreliable on CDMA networks (use {@link #getPhoneType()} to determine if
- * on a CDMA network).
+ * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
+ * if on a CDMA network).
*
* @param subId for which Network CountryIso is returned
* @hide
@@ -7028,31 +7027,6 @@
}
/**
- * 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.
*
* If this object has been created with {@link #createForSubscriptionId}, applies to the