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

Merge "Update API doc for accidentally exposed NETWORK_TYPE_BITMASK_LTE_CA" am: 2ca9a7aeaa

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

Change-Id: Ia0cd9db993d4ed0f40c64bf07dc4ea1176026a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-05-03 07:49:38 +00:00
committed by Automerger Merge Worker
parent 7613c6d580 2ca9a7aeaa
commit 99afbf9a1b
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9051,6 +9051,7 @@ public class TelephonyManager {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
networkTypeBitmask = checkNetworkTypeBitmask(networkTypeBitmask);
return telephony.setAllowedNetworkTypesForReason(getSubId(), return telephony.setAllowedNetworkTypesForReason(getSubId(),
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkTypeBitmask); TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkTypeBitmask);
} }
@@ -9060,6 +9061,20 @@ public class TelephonyManager {
return false; return false;
} }
/**
* If {@link #NETWORK_TYPE_BITMASK_LTE_CA} bit is set, convert it to NETWORK_TYPE_BITMASK_LTE.
*
* @param networkTypeBitmask The networkTypeBitmask being checked
* @return The checked/converted networkTypeBitmask
*/
private long checkNetworkTypeBitmask(@NetworkTypeBitMask long networkTypeBitmask) {
if ((networkTypeBitmask & NETWORK_TYPE_BITMASK_LTE_CA) != 0) {
networkTypeBitmask ^= NETWORK_TYPE_BITMASK_LTE_CA;
networkTypeBitmask |= NETWORK_TYPE_BITMASK_LTE;
}
return networkTypeBitmask;
}
/** /**
* Set the allowed network types of the device. This is for carrier or privileged apps to * Set the allowed network types of the device. This is for carrier or privileged apps to
* enable/disable certain network types on the device. The user preferred network types should * enable/disable certain network types on the device. The user preferred network types should
@@ -9086,6 +9101,7 @@ public class TelephonyManager {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);
return telephony.setAllowedNetworkTypesForReason(getSubId(), return telephony.setAllowedNetworkTypesForReason(getSubId(),
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER, allowedNetworkTypes); TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER, allowedNetworkTypes);
} }
@@ -9171,6 +9187,7 @@ public class TelephonyManager {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);
telephony.setAllowedNetworkTypesForReason(getSubId(), reason, telephony.setAllowedNetworkTypesForReason(getSubId(), reason,
allowedNetworkTypes); allowedNetworkTypes);
} else { } else {
@@ -13429,7 +13446,11 @@ public class TelephonyManager {
*/ */
public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1)); public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));
/** /**
* NOT USED; this bitmask is exposed accidentally, will be deprecated in U.
* If used, will be converted to {@link #NETWORK_TYPE_BITMASK_LTE}.
* network type bitmask indicating the support of radio tech LTE CA (carrier aggregation). * network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).
*
* @see #NETWORK_TYPE_BITMASK_LTE
*/ */
public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1)); public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));