Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e410196 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal... 

Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
parents 82008858 3fb3abd1

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/TelephonyManager.java

+1 −3
Original line number Diff line number Diff line
@@ -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() {