diff options
| author | Junda Liu <junda@google.com> | 2015-01-14 00:06:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-14 00:06:19 +0000 |
| commit | 6e41019633975358cf2f84c5d1e09e6e3a049875 (patch) | |
| tree | 2f9cbd3a63f74c1cb2b4ab5ec9be1999685564b8 /telephony/java | |
| parent | 820088587e732fe04b705248a06f275bf264be33 (diff) | |
| parent | 3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5 (diff) | |
| download | frameworks_base-6e41019633975358cf2f84c5d1e09e6e3a049875.zip frameworks_base-6e41019633975358cf2f84c5d1e09e6e3a049875.tar.gz frameworks_base-6e41019633975358cf2f84c5d1e09e6e3a049875.tar.bz2 | |
Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
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() { |