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

Commit 1cea0c24 authored by Jeff Davidson's avatar Jeff Davidson Committed by android-build-merger
Browse files

Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d62277 am: fa8e6c0f 

am: b369ad4b

Change-Id: I0ed5ac68a7974ade21b1d6aa2279fde179070c0c
parents cf1a558a b369ad4b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37380,6 +37380,7 @@ package android.telephony { 
    method public int getCallState();

    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();
@@ -37424,6 +37425,7 @@ package android.telephony { 
    method public boolean isWorldPhone();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);

    method public void setDataEnabled(boolean);

    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);

    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setPreferredNetworkTypeToGlobal();

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37462,6 +37462,7 @@ package android.telephony { 
    method public int getCallState();

    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();
@@ -37506,6 +37507,7 @@ package android.telephony { 
    method public boolean isWorldPhone();

    method public void listen(android.telephony.PhoneStateListener, int);

    method public java.lang.String sendEnvelopeWithStatus(java.lang.String);

    method public void setDataEnabled(boolean);

    method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);

    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setPreferredNetworkTypeToGlobal();

telephony/java/android/telephony/TelephonyManager.java

+25 −6
Original line number Diff line number Diff line
@@ -4765,10 +4765,19 @@ public class TelephonyManager { 
        return false;

    }



    /** @hide */

    @SystemApi

    /**

     * Turns mobile data on or off.

     *

     * <p>Requires Permission:

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

     *     calling app has carrier privileges.

     *

     * @param enable Whether to enable mobile data.

     *

     * @see #hasCarrierPrivileges

     */

    public void setDataEnabled(boolean enable) {

        setDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId(), enable);

        setDataEnabled(getSubId(), enable);

    }



    /** @hide */
@@ -4784,10 +4793,20 @@ public class TelephonyManager { 
        }

    }



    /** @hide */

    @SystemApi

    /**

     * Returns whether mobile data is enabled or not.

     *

     * <p>Requires Permission:

     *     {@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.

     *

     * @return true if mobile data is enabled.

     *

     * @see #hasCarrierPrivileges

     */

    public boolean getDataEnabled() {

        return getDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId());

        return getDataEnabled(getSubId());

    }



    /** @hide */