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

Commit ea27babb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[TelephonyMainline] @hide system api since we'll revisit in S. -... 

Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" into rvc-dev am: 365dfedd

Change-Id: Id622807215d7697221e267580f5c8c9d02962e68
parents 9193f363 365dfedd

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -11599,7 +11599,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApnMetered(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataAllowedInVoiceCall();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataConnectionAllowed();

    method public boolean isDataConnectivityPossible();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);
@@ -11641,7 +11640,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCdmaRoamingMode(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCdmaSubscriptionMode(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setDataAllowedDuringVoiceCall(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIccLockEnabled(boolean, @NonNull String);

telephony/java/android/telephony/TelephonyManager.java

+0 −2
Original line number Diff line number Diff line
@@ -12888,7 +12888,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setDataAllowedDuringVoiceCall(boolean allow) {

        try {
@@ -12917,7 +12916,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isDataAllowedInVoiceCall() {

        try {