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

Commit 6f599559 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Rename getDataEnabled() to isDataEnabled()."

parents d7bc388f dc9a6fb9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39812,7 +39812,6 @@ package android.telephony { 
    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public boolean getDataEnabled();

    method public int getDataNetworkType();

    method public int getDataState();

    method public java.lang.String getDeviceId();
@@ -39853,6 +39852,7 @@ package android.telephony { 
    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);

    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isDataEnabled();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isNetworkRoaming();

    method public boolean isSmsCapable();

api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -43216,8 +43216,8 @@ package android.telephony { 
    method public int getCurrentPhoneType();

    method public int getCurrentPhoneType(int);

    method public int getDataActivity();

    method public boolean getDataEnabled();

    method public boolean getDataEnabled(int);

    method public deprecated boolean getDataEnabled();

    method public deprecated boolean getDataEnabled(int);

    method public int getDataNetworkType();

    method public int getDataState();

    method public java.lang.String getDeviceId();
@@ -43264,6 +43264,7 @@ package android.telephony { 
    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isDataConnectivityPossible();

    method public boolean isDataEnabled();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isIdle();

    method public boolean isNetworkRoaming();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40001,7 +40001,6 @@ package android.telephony { 
    method public android.os.PersistableBundle getCarrierConfig();

    method public android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method public boolean getDataEnabled();

    method public int getDataNetworkType();

    method public int getDataState();

    method public java.lang.String getDeviceId();
@@ -40042,6 +40041,7 @@ package android.telephony { 
    method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);

    method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isDataEnabled();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isNetworkRoaming();

    method public boolean isSmsCapable();

telephony/java/android/telephony/TelephonyManager.java

+25 −6
Original line number Diff line number Diff line
@@ -5276,23 +5276,42 @@ public class TelephonyManager { 
        }

    }





    /**

     * @deprecated use {@link #isDataEnabled()} instead.

     * @hide

     */

    @SystemApi

    @Deprecated

    public boolean getDataEnabled() {

        return isDataEnabled();

    }



    /**

     * Returns whether mobile data is enabled or not.

     *

     * <p>Requires Permission:

     * <p>Requires one of the following permissions:

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE ACCESS_NETWORK_STATE},

     * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}, or that the

     * calling app has carrier privileges.

     *

     * <p>Note that this does not take into account any data restrictions that may be present on the

     * calling app. Such restrictions may be inspected with

     * {@link ConnectivityManager#getRestrictBackgroundStatus}.

     *

     * @return true if mobile data is enabled.

     *

     * @see #hasCarrierPrivileges

     */

    public boolean getDataEnabled() {

    @SuppressWarnings("deprecation")

    public boolean isDataEnabled() {

        return getDataEnabled(getSubId());

    }



    /** @hide */

    /**

     * @deprecated use {@link #isDataEnabled(int)} instead.

     * @hide

     */

    @SystemApi

    public boolean getDataEnabled(int subId) {

        boolean retVal = false;