Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set country code even when device is not registered on network"

Browse Source
This commit is contained in:
Treehugger Robot
2018-04-23 05:48:18 +00:00
committed by Gerrit Code Review
parent 03cdc95f1c d33f8a1e91
commit fc9bc10d69
1 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1810,24 +1810,23 @@ public class TelephonyManager {
}
/**
* 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
@@ -7027,31 +7026,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.
*