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

Commit 9a0cae2d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Hide setPolicyDataEnabled" into rvc-dev am: 710401a6 am: 859b937f 

Change-Id: I649973c31dc3520bc0cee122f55660a9ad3a7b98
parents 25b8a80d 859b937f

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -11812,7 +11812,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

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

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

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

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

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

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

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

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

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

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

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

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

telephony/java/android/telephony/TelephonyManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -11071,7 +11071,6 @@ public class TelephonyManager { 
     * @param enabled True if enabling the data, otherwise disabling.

     * @param enabled True if enabling the data, otherwise disabling.

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public void setPolicyDataEnabled(boolean enabled) {

    public void setPolicyDataEnabled(boolean enabled) {

        try {

        try {