Revert "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council."
This reverts commit 3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5.o
This is required to prevert Tycho from crashing until a new SDK is dropped later today (2015-01-16)
Bug: 18983535
diff --git a/api/current.txt b/api/current.txt
index 3e11cda..660c212 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28689,9 +28689,9 @@
method public boolean isVoiceCapable();
method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
+ method public boolean setGlobalPreferredNetworkType();
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
- method public boolean setPreferredNetworkTypeToGlobal();
method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index dca1f82..99d0af1 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3099,7 +3099,7 @@
*
* @return true on success; false on any failure.
*/
- public boolean setPreferredNetworkTypeToGlobal() {
+ public boolean setGlobalPreferredNetworkType() {
return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
}
@@ -3142,6 +3142,8 @@
* 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() {
