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

Commit a811ccf1 authored by Gil Cukierman's avatar Gil Cukierman Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cukie-2genterprise-user-restriction" am: 6c70a328... 

Merge changes from topic "cukie-2genterprise-user-restriction" am: 6c70a328 am: b1a26bf5 am: af4dee0c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221241



Change-Id: I8d46f7ad5447e825b090bc001d625509d29ab48b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d67d27a1 af4dee0c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13706,6 +13706,7 @@ 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

+12 −1
Original line number Diff line number Diff line
@@ -9476,7 +9476,8 @@ public class TelephonyManager { 
            ALLOWED_NETWORK_TYPES_REASON_USER,

            ALLOWED_NETWORK_TYPES_REASON_POWER,

            ALLOWED_NETWORK_TYPES_REASON_CARRIER,

            ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G

            ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G,

            ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface AllowedNetworkTypesReason {
@@ -9514,6 +9515,15 @@ 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.










@@ -9606,6 +9616,7 @@ 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;