Merge "Unhide API setAllowedNetworkTypesForReason and getSupportedRadioAccessFamily" (cfe28cb9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -43232,6 +43232,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean doesSwitchMultiSimConfigTriggerReboot();
		method public int getActiveModemCount();
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public long getAllowedNetworkTypesForReason(int);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCallComposerStatus();
		method @Deprecated @RequiresPermission(value=android.Manifest.permission.READ_PHONE_STATE, conditional=true) public int getCallState();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getCallStateForSubscription();
		@@ -43292,6 +43293,7 @@ package android.telephony {
		method public int getSubscriptionId();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getSubscriptionId(@NonNull android.telecom.PhoneAccountHandle);
		method public int getSupportedModemCount();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public long getSupportedRadioAccessFamily();
		method @Nullable public String getTypeAllocationCode();
		method @Nullable public String getTypeAllocationCode(int);
		method @NonNull @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public java.util.List<android.telephony.UiccCardInfo> getUiccCardsInfo();
		@@ -43337,6 +43339,7 @@ package android.telephony {
		method public String sendEnvelopeWithStatus(String);
		method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);
		method public void sendVisualVoicemailSms(String, int, String, android.app.PendingIntent);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAllowedNetworkTypesForReason(int, long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallComposerStatus(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabledForReason(int, boolean);
		@@ -43373,6 +43376,8 @@ package android.telephony {
		field public static final String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
		field public static final String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED";
		field public static final String ACTION_SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED";
		field public static final int ALLOWED_NETWORK_TYPES_REASON_CARRIER = 2; // 0x2
		field public static final int ALLOWED_NETWORK_TYPES_REASON_USER = 0; // 0x0
		field public static final int APPTYPE_CSIM = 4; // 0x4
		field public static final int APPTYPE_ISIM = 5; // 0x5
		field public static final int APPTYPE_RUIM = 3; // 0x3
		@@ -43447,6 +43452,26 @@ package android.telephony {
		field public static final int NETWORK_SELECTION_MODE_MANUAL = 2; // 0x2
		field public static final int NETWORK_SELECTION_MODE_UNKNOWN = 0; // 0x0
		field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
		field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
		field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
		field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L
		field public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_0 = 16L; // 0x10L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_A = 32L; // 0x20L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_B = 2048L; // 0x800L
		field public static final long NETWORK_TYPE_BITMASK_GPRS = 1L; // 0x1L
		field public static final long NETWORK_TYPE_BITMASK_GSM = 32768L; // 0x8000L
		field public static final long NETWORK_TYPE_BITMASK_HSDPA = 128L; // 0x80L
		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_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 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
		field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L
		field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
		field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
		field public static final int NETWORK_TYPE_EHRPD = 14; // 0xe

core/api/system-current.txt

+0 −25

Original line number	Diff line number	Diff line
		@@ -13208,7 +13208,6 @@ package android.telephony {
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypes();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypesBitmask();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getAllowedNetworkTypesForReason(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallForwarding(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CallForwardingInfoCallback);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getCallWaitingStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		@@ -13254,7 +13253,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getSimCardState(int, int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Locale getSimLocale();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Collection<android.telephony.UiccSlotMapping> getSimSlotMapping();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.telephony.RadioAccessSpecifier> getSystemSelectionChannels();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.UiccSlotInfo[] getUiccSlotsInfo();
		@@ -13309,7 +13307,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int sendThermalMitigationRequest(@NonNull android.telephony.ThermalMitigationRequest);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAllowedNetworkTypesForReason(int, long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);
		@@ -13359,10 +13356,8 @@ package android.telephony {
		field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
		field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_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_CARRIER = 2; // 0x2
		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 = 0; // 0x0
		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
		@@ -13402,26 +13397,6 @@ package android.telephony {
		field public static final int KEY_TYPE_WLAN = 2; // 0x2
		field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1
		field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2
		field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
		field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
		field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L
		field public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_0 = 16L; // 0x10L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_A = 32L; // 0x20L
		field public static final long NETWORK_TYPE_BITMASK_EVDO_B = 2048L; // 0x800L
		field public static final long NETWORK_TYPE_BITMASK_GPRS = 1L; // 0x1L
		field public static final long NETWORK_TYPE_BITMASK_GSM = 32768L; // 0x8000L
		field public static final long NETWORK_TYPE_BITMASK_HSDPA = 128L; // 0x80L
		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_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 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
		field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L
		field public static final int NR_DUAL_CONNECTIVITY_DISABLE = 2; // 0x2
		field public static final int NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE = 3; // 0x3
		field public static final int NR_DUAL_CONNECTIVITY_ENABLE = 1; // 0x1

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -2520,7 +2520,6 @@ package android.telephony {
		method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
		method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();
		method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
		method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

telephony/java/android/telephony/TelephonyManager.java

+14 −70

Original line number	Diff line number	Diff line
		@@ -9199,7 +9199,8 @@ public class TelephonyManager {
		* @param allowedNetworkTypes The bitmask of allowed network types.
		* @return true on success; false on any failure.
		* @hide
		* @deprecated Use {@link #setAllowedNetworkTypesForReason} instead.
		* @deprecated Use {@link #setAllowedNetworkTypesForReason} instead with reason
		* {@link #ALLOWED_NETWORK_TYPES_REASON_CARRIER}.
		*/
		@Deprecated
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@@ -9233,10 +9234,7 @@ public class TelephonyManager {

		/**
		* To indicate allowed network type change is requested by user.
		*
		* @hide
		*/
		@SystemApi
		public static final int ALLOWED_NETWORK_TYPES_REASON_USER = 0;

		/**
		@@ -9255,10 +9253,7 @@ public class TelephonyManager {
		* Carrier configuration won't affect the settings configured through
		* other reasons and will result in allowing network types that are in both
		* configurations (i.e intersection of both sets).
		*
		* @hide
		*/
		@SystemApi
		public static final int ALLOWED_NETWORK_TYPES_REASON_CARRIER = 2;

		/**
		@@ -9272,35 +9267,23 @@ public class TelephonyManager {
		/**
		* Set the allowed network types of the device and provide the reason triggering the allowed
		* network change.
		* <p>Requires permission: android.Manifest.MODIFY_PHONE_STATE or
		* that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
		*
		* This can be called for following reasons
		* <ol>
		* <li>Allowed network types control by USER {@link #ALLOWED_NETWORK_TYPES_REASON_USER}
		* <li>Allowed network types control by power manager
		* {@link #ALLOWED_NETWORK_TYPES_REASON_POWER}
		* <li>Allowed network types control by carrier {@link #ALLOWED_NETWORK_TYPES_REASON_CARRIER}
		* <li>Allowed network types control by the user-controlled "Allow 2G" toggle
		* {@link #ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G}
		* </ol>
		* This API will result in allowing an intersection of allowed network types for all reasons,
		* including the configuration done through other reasons.
		*
		* The functionality of this API with the parameter
		* {@link #ALLOWED_NETWORK_TYPES_REASON_CARRIER} is the same as the API
		* {@link TelephonyManager#setAllowedNetworkTypes}. Use this API instead of
		* {@link TelephonyManager#setAllowedNetworkTypes}.
		* <p>
		* If {@link android.telephony.TelephonyManager#isRadioInterfaceCapabilitySupported}
		* ({@link TelephonyManager#CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK}) returns true, then
		* setAllowedNetworkTypesBitmap is used on the radio interface. Otherwise,
		* setPreferredNetworkTypesBitmap is used instead.
		*
		* @param reason the reason the allowed network type change is taking place
		* @param allowedNetworkTypes The bitmask of allowed network types.
		* @param allowedNetworkTypes The bitmask of allowed network type
		* @throws IllegalStateException if the Telephony process is not currently available.
		* @throws IllegalArgumentException if invalid AllowedNetworkTypesReason is passed.
		* @hide
		* @throws SecurityException if the caller does not have the required privileges
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(
		enforcement = "android.telephony.TelephonyManager#isRadioInterfaceCapabilitySupported",
		@@ -9330,18 +9313,19 @@ public class TelephonyManager {
		*
		* {@link #getAllowedNetworkTypesForReason} returns allowed network type for a
		* specific reason.
		* <p>Requires permission: android.Manifest.READ_PRIVILEGED_PHONE_STATE or
		* that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
		*
		* @param reason the reason the allowed network type change is taking place
		* @return the allowed network type bitmask
		* @throws IllegalStateException if the Telephony process is not currently available.
		* @throws IllegalArgumentException if invalid AllowedNetworkTypesReason is passed.
		* @hide
		* @throws SecurityException if the caller does not have the required permission/privileges
		*/
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(
		enforcement = "android.telephony.TelephonyManager#isRadioInterfaceCapabilitySupported",
		value = TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK)
		@SystemApi
		public @NetworkTypeBitMask long getAllowedNetworkTypesForReason(
		@AllowedNetworkTypesReason int reason) {
		if (!isValidAllowedNetworkTypesReason(reason)) {
		@@ -13560,127 +13544,88 @@ public class TelephonyManager {
		// 2G
		/**
		* network type bitmask unknown.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L;
		/**
		* network type bitmask indicating the support of radio tech GSM.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_GSM = (1 << (NETWORK_TYPE_GSM -1));
		/**
		* network type bitmask indicating the support of radio tech GPRS.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_GPRS = (1 << (NETWORK_TYPE_GPRS -1));
		/**
		* network type bitmask indicating the support of radio tech EDGE.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_EDGE = (1 << (NETWORK_TYPE_EDGE -1));
		/**
		* network type bitmask indicating the support of radio tech CDMA(IS95A/IS95B).
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_CDMA = (1 << (NETWORK_TYPE_CDMA -1));
		/**
		* network type bitmask indicating the support of radio tech 1xRTT.
		* @hide
		*/
		@SystemApi
		@SuppressLint("AllUpper")
		public static final long NETWORK_TYPE_BITMASK_1xRTT = (1 << (NETWORK_TYPE_1xRTT - 1));
		// 3G
		/**
		* network type bitmask indicating the support of radio tech EVDO 0.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_EVDO_0 = (1 << (NETWORK_TYPE_EVDO_0 -1));
		/**
		* network type bitmask indicating the support of radio tech EVDO A.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_EVDO_A = (1 << (NETWORK_TYPE_EVDO_A - 1));
		/**
		* network type bitmask indicating the support of radio tech EVDO B.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_EVDO_B = (1 << (NETWORK_TYPE_EVDO_B -1));
		/**
		* network type bitmask indicating the support of radio tech EHRPD.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_EHRPD = (1 << (NETWORK_TYPE_EHRPD -1));
		/**
		* network type bitmask indicating the support of radio tech HSUPA.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_HSUPA = (1 << (NETWORK_TYPE_HSUPA -1));
		/**
		* network type bitmask indicating the support of radio tech HSDPA.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_HSDPA = (1 << (NETWORK_TYPE_HSDPA -1));
		/**
		* network type bitmask indicating the support of radio tech HSPA.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_HSPA = (1 << (NETWORK_TYPE_HSPA -1));
		/**
		* network type bitmask indicating the support of radio tech HSPAP.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_HSPAP = (1 << (NETWORK_TYPE_HSPAP -1));
		/**
		* network type bitmask indicating the support of radio tech UMTS.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_UMTS = (1 << (NETWORK_TYPE_UMTS -1));
		/**
		* network type bitmask indicating the support of radio tech TD_SCDMA.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = (1 << (NETWORK_TYPE_TD_SCDMA -1));
		// 4G
		/**
		* network type bitmask indicating the support of radio tech LTE.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));
		/**
		* network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));

		/**
		* network type bitmask indicating the support of radio tech NR(New Radio) 5G.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_NR = (1 << (NETWORK_TYPE_NR -1));

		/**
		* network type bitmask indicating the support of radio tech IWLAN.
		* @hide
		*/
		@SystemApi
		public static final long NETWORK_TYPE_BITMASK_IWLAN = (1 << (NETWORK_TYPE_IWLAN -1));

		/** @hide */
		@@ -13735,12 +13680,11 @@ public class TelephonyManager {
		/**
		* @return Modem supported radio access family bitmask
		*
		* <p>Requires permission: {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or
		* <p>Requires permission: android.Manifest.READ_PRIVILEGED_PHONE_STATE or
		* that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
		* @hide
		*
		* @throws SecurityException if the caller does not have the required permission
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)
		public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {