From e008e7e9fd2cb26073438689f037061034d7f9cb Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Tue, 18 Oct 2022 16:48:43 -0700 Subject: [PATCH] Refine TelephonyManager#getBitMaskForNetworkType - Replace 1 << (NETWORK_TYPE_IDEN - 1) with NETWORK_TYPE_BITMASK_IDEN - Deprecate NETWORK_TYPE_BITMASK_LTE_CA - Combine NETWORK_TYPE_LTE and NETWORK_TYPE_LTE_CA to both return NETWORK_TYPE_BITMASK_LTE Bug: 230384032 Test: m Change-Id: I1f83990a53be9ce10bf8f6f4debdbd8eb187b9e2 --- core/api/current.txt | 3 ++- .../android/telephony/TelephonyManager.java | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index e5cc625038ddf..6df2ef724e636 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -43952,9 +43952,10 @@ package android.telephony { field public static final long NETWORK_TYPE_BITMASK_HSPA = 512L; // 0x200L field public static final long NETWORK_TYPE_BITMASK_HSPAP = 16384L; // 0x4000L field public static final long NETWORK_TYPE_BITMASK_HSUPA = 256L; // 0x100L + field public static final long NETWORK_TYPE_BITMASK_IDEN = 1024L; // 0x400L field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L - field public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L + field @Deprecated public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L field public static final long NETWORK_TYPE_BITMASK_NR = 524288L; // 0x80000L field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f3d48a849b0fa..fbb8d3c2237f5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3322,15 +3322,14 @@ public class TelephonyManager { case NETWORK_TYPE_TD_SCDMA: return NETWORK_TYPE_BITMASK_TD_SCDMA; case NETWORK_TYPE_LTE: - return NETWORK_TYPE_BITMASK_LTE; case NETWORK_TYPE_LTE_CA: - return NETWORK_TYPE_BITMASK_LTE_CA; + return NETWORK_TYPE_BITMASK_LTE; case NETWORK_TYPE_NR: return NETWORK_TYPE_BITMASK_NR; case NETWORK_TYPE_IWLAN: return NETWORK_TYPE_BITMASK_IWLAN; case NETWORK_TYPE_IDEN: - return (1 << (NETWORK_TYPE_IDEN - 1)); + return NETWORK_TYPE_BITMASK_IDEN; default: return NETWORK_TYPE_BITMASK_UNKNOWN; } @@ -13910,7 +13909,8 @@ public class TelephonyManager { NETWORK_TYPE_BITMASK_LTE, NETWORK_TYPE_BITMASK_LTE_CA, NETWORK_TYPE_BITMASK_NR, - NETWORK_TYPE_BITMASK_IWLAN + NETWORK_TYPE_BITMASK_IWLAN, + NETWORK_TYPE_BITMASK_IDEN }) public @interface NetworkTypeBitMask {} @@ -13969,6 +13969,10 @@ public class TelephonyManager { * network type bitmask indicating the support of radio tech HSPA. */ public static final long NETWORK_TYPE_BITMASK_HSPA = (1 << (NETWORK_TYPE_HSPA -1)); + /** + * network type bitmask indicating the support of radio tech iDen. + */ + public static final long NETWORK_TYPE_BITMASK_IDEN = (1 << (NETWORK_TYPE_IDEN - 1)); /** * network type bitmask indicating the support of radio tech HSPAP. */ @@ -13987,12 +13991,13 @@ public class TelephonyManager { */ 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. + * NOT USED; this bitmask is exposed accidentally. * If used, will be converted to {@link #NETWORK_TYPE_BITMASK_LTE}. * network type bitmask indicating the support of radio tech LTE CA (carrier aggregation). * - * @see #NETWORK_TYPE_BITMASK_LTE + * @deprecated Please use {@link #NETWORK_TYPE_BITMASK_LTE} instead. */ + @Deprecated public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1)); /**