diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 14 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/TelephonyProperties.java | 15 |
2 files changed, 19 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c9dcd8b0dd2a..ba5c6e73680a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -322,7 +322,9 @@ public class TelephonyManager { /** * Returns the alphabetic name of current registered operator. * <p> - * Availability: Only when user is registered to a network + * 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). */ public String getNetworkOperatorName() { return SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_ALPHA); @@ -331,7 +333,9 @@ public class TelephonyManager { /** * Returns the numeric name (MCC+MNC) of current registered operator. * <p> - * Availability: Only when user is registered to a network + * 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). */ public String getNetworkOperator() { return SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_NUMERIC); @@ -341,7 +345,7 @@ public class TelephonyManager { * Returns true if the device is considered roaming on the current * network, for GSM purposes. * <p> - * Availability: Only when user registered to a network + * Availability: Only when user registered to a network. */ public boolean isNetworkRoaming() { return "true".equals(SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_ISROAMING)); @@ -351,7 +355,9 @@ public class TelephonyManager { * Returns the ISO country code equivilent of the current registered * operator's MCC (Mobile Country Code). * <p> - * Availability: Only when user is registered to a network + * 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). */ public String getNetworkCountryIso() { return SystemProperties.get(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY); diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java index 290e1fc24b71..5ec4020d6fdc 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java +++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java @@ -40,14 +40,16 @@ public interface TelephonyProperties //****** Current Network - /** Alpha name of current registered operator. - * Availability: when registered to a network + /** Alpha name of current registered operator.<p> + * Availability: when registered to a network. Result may be unreliable on + * CDMA networks. */ static final String PROPERTY_OPERATOR_ALPHA = "gsm.operator.alpha"; //TODO: most of these proprieties are generic, substitute gsm. with phone. bug 1856959 - /** Numeric name (MCC+MNC) of current registered operator. - * Availability: when registered to a network + /** Numeric name (MCC+MNC) of current registered operator.<p> + * Availability: when registered to a network. Result may be unreliable on + * CDMA networks. */ static final String PROPERTY_OPERATOR_NUMERIC = "gsm.operator.numeric"; @@ -64,8 +66,9 @@ public interface TelephonyProperties static final String PROPERTY_OPERATOR_ISROAMING = "gsm.operator.isroaming"; /** The ISO country code equivalent of the current registered operator's - * MCC (Mobile Country Code) - * Availability: when registered to a network + * MCC (Mobile Country Code)<p> + * Availability: when registered to a network. Result may be unreliable on + * CDMA networks. */ static final String PROPERTY_OPERATOR_ISO_COUNTRY = "gsm.operator.iso-country"; |