summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-01-13 13:50:25 -0800
committerJunda Liu <junda@google.com>2015-01-13 14:11:11 -0800
commit3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5 (patch)
treefd7110b9582268143eede575dfad192afe9950a5 /telephony/java
parentef04ae79af58cc86c4312fac18c8a4eb24fc73ae (diff)
downloadframeworks_base-3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5.zip
frameworks_base-3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5.tar.gz
frameworks_base-3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5.tar.bz2
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Bug: b/18983535 Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 99d0af1..dca1f82 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3099,7 +3099,7 @@ public class TelephonyManager {
*
* @return true on success; false on any failure.
*/
- public boolean setGlobalPreferredNetworkType() {
+ public boolean setPreferredNetworkTypeToGlobal() {
return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
}
@@ -3142,8 +3142,6 @@ public class TelephonyManager {
* call will return true. This access is granted by the owner of the UICC
* card and does not depend on the registered carrier.
*
- * TODO: Add a link to documentation.
- *
* @return true if the app has carrier privileges.
*/
public boolean hasCarrierPrivileges() {