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

Merge "Remove ALLOWED_NETWORK_TYPES_USER_RESTRICTIONS"

Browse Source
This commit is contained in:
Gil Cukierman
2023-01-31 17:51:24 +00:00
committed by Android (Google) Code Review
parent b654014439 7c711e2fd0
commit 738650d918
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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;