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

Commit 4fdc013e authored by zoey chen's avatar zoey chen
Browse files

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

Test: make
Bug: 146107006
Change-Id: I62a0249a1462c9e8d71552e2304642eb6bde3eb5
Merged-In: I62a0249a1462c9e8d71552e2304642eb6bde3eb5
parent 240f5bb4

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -9364,7 +9364,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 isApplicationOnUicc(int);

    method public boolean isCurrentSimOperator(@NonNull String, int, @Nullable String);

    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);
@@ -9408,7 +9407,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 −3
Original line number Diff line number Diff line
@@ -12624,7 +12624,6 @@ public class TelephonyManager { 
    }



    /**

<<<<<<< HEAD

     * Gets the voice call forwarding info {@link CallForwardingInfo}, given the call forward

     * reason.

     *
@@ -12824,7 +12823,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setDataAllowedDuringVoiceCall(boolean allow) {

        try {
@@ -12853,7 +12851,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isDataAllowedInVoiceCall() {

        try {