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

Commit 738650d9 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "Remove ALLOWED_NETWORK_TYPES_USER_RESTRICTIONS"

parents b6540144 7c711e2f

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -14347,7 +14347,6 @@ package android.telephony { 
    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";

    field public static final int ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G = 3; // 0x3

    field public static final int ALLOWED_NETWORK_TYPES_REASON_POWER = 1; // 0x1

    field public static final int ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS = 4; // 0x4

    field public static final int CALL_WAITING_STATUS_DISABLED = 2; // 0x2

    field public static final int CALL_WAITING_STATUS_ENABLED = 1; // 0x1

    field public static final int CALL_WAITING_STATUS_FDN_CHECK_FAILURE = 5; // 0x5

telephony/java/android/telephony/TelephonyManager.java

+0 −12
Original line number Diff line number Diff line
@@ -9432,7 +9432,6 @@ public class TelephonyManager { 
            ALLOWED_NETWORK_TYPES_REASON_POWER,

            ALLOWED_NETWORK_TYPES_REASON_CARRIER,

            ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G,

            ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface AllowedNetworkTypesReason {
@@ -9470,15 +9469,6 @@ public class TelephonyManager { 
    @SystemApi

    public static final int ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G = 3;













    /**













     * To indicate allowed network type change is requested by an update to the













     * {@link android.os.UserManager.DISALLOW_CELLULAR_2G} user restriction.













     *













     * @hide













     */













    @SystemApi













    public static final int ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS = 4;



























    /**















     * Set the allowed network types of the device and provide the reason triggering the allowed















     * network change.









@@ -9503,7 +9493,6 @@ public class TelephonyManager {













     * {@link android.Manifest.permission#MODIFY_PHONE_STATE} permissions.















     * <ol>















     *     <li>{@code TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G}</li>













     *     <li>{@code TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS}</li>















     * </ol>















     */















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)










@@ -9578,7 +9567,6 @@ public class TelephonyManager {













            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER:















            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER:















            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G:













            case ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS:















                return true;















        }















        return false;