diff options
| author | Junda Liu <junda@google.com> | 2015-01-14 00:17:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-14 00:17:58 +0000 |
| commit | 427e7162ca02473069b48affeadb1216184c1724 (patch) | |
| tree | 44eeb37eb03dd1f393c7a94f0ef64e9f7480f109 /telephony/java/android | |
| parent | 4a7b0062a13faec410a954798ddc091e90e57127 (diff) | |
| parent | ead0184548fdd341f5903d9ce35604c926dcddde (diff) | |
| download | frameworks_base-427e7162ca02473069b48affeadb1216184c1724.zip frameworks_base-427e7162ca02473069b48affeadb1216184c1724.tar.gz frameworks_base-427e7162ca02473069b48affeadb1216184c1724.tar.bz2 | |
am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
Diffstat (limited to 'telephony/java/android')
| -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 34315bf..03cc7d0 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3095,7 +3095,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); } @@ -3138,8 +3138,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() { |