Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I13a9dea21f64bcc63bdb79430c3ac34863b2fa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gil Cukierman
2022-11-01 14:22:06 +00:00
committed by Automerger Merge Worker
parent c8188d9619 6c70a328e5
commit b1a26bf520
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -13553,6 +13553,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 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_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_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_DISABLED = 2; // 0x2
field public static final int CALL_WAITING_STATUS_ENABLED = 1; // 0x1 field public static final int CALL_WAITING_STATUS_ENABLED = 1; // 0x1
field public static final int CALL_WAITING_STATUS_FDN_CHECK_FAILURE = 5; // 0x5 field public static final int CALL_WAITING_STATUS_FDN_CHECK_FAILURE = 5; // 0x5

13
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -9358,7 +9358,8 @@ public class TelephonyManager {
ALLOWED_NETWORK_TYPES_REASON_USER, ALLOWED_NETWORK_TYPES_REASON_USER,
ALLOWED_NETWORK_TYPES_REASON_POWER, ALLOWED_NETWORK_TYPES_REASON_POWER,
ALLOWED_NETWORK_TYPES_REASON_CARRIER, 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) @Retention(RetentionPolicy.SOURCE)
public @interface AllowedNetworkTypesReason { public @interface AllowedNetworkTypesReason {
@@ -9396,6 +9397,15 @@ public class TelephonyManager {
@SystemApi @SystemApi
public static final int ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G = 3; 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 * Set the allowed network types of the device and provide the reason triggering the allowed
* network change. * network change.
@@ -9488,6 +9498,7 @@ public class TelephonyManager {
case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER: case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER:
case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER: case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER:
case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G: case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G:
case ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS:
return true; return true;
} }
return false; return false;