Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev

Browse Source 
* commit '6e41019633975358cf2f84c5d1e09e6e3a049875':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
This commit is contained in:
Junda Liu
2015-01-14 00:09:53 +00:00
committed by Android Git Automerger
parent 561cf95955 6e41019633
commit ead0184548
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28686,9 +28686,9 @@ package android.telephony {
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";

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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() {