diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
| commit | 568e54be71731bdbcd5338385eb6cc6a082c9456 (patch) | |
| tree | 9cbbe50e8824a72d7afda5ef75a45584742e200a /telephony/java | |
| parent | 4bc5b2bce9b1e3483357966f4ef074391565255f (diff) | |
| parent | 87f536948c06e57d2f9e78f39c01272cb08de1f1 (diff) | |
| download | frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.zip frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.gz frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.bz2 | |
resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
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 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() { |