Snap for 11876238 from b5c7aac8119ea164cefdfeed9cddc0cea45c55eb to 24Q3-release (cbc1d6a5) · Commits · e / os / android_frameworks_opt_telephony

proto/src/persist_atoms.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -719,6 +719,7 @@ message SatelliteSession {
		optional int32 count_of_incoming_datagram_success = 10;
		optional int32 count_of_incoming_datagram_failed = 11;
		optional bool is_demo_mode = 12;
		optional int32 max_ntn_signal_strength_level = 13;
		}

		message SatelliteIncomingDatagram {

src/java/com/android/internal/telephony/Phone.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4915,7 +4915,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		/**
		* @return The data network controller
		*/
		public @Nullable DataNetworkController getDataNetworkController() {
		public @NonNull DataNetworkController getDataNetworkController() {
		return mDataNetworkController;
		}

src/java/com/android/internal/telephony/data/AccessNetworksManager.java

+19 −12

Original line number	Diff line number	Diff line
		@@ -148,7 +148,9 @@ public class AccessNetworksManager extends Handler {
		@ApnType
		public final int apnType;
		// The qualified networks in preferred order. Each network is a AccessNetworkType.
		public final @NonNull @RadioAccessNetworkType int[] qualifiedNetworks;
		@NonNull
		@RadioAccessNetworkType
		public final int[] qualifiedNetworks;
		public QualifiedNetworks(@ApnType int apnType, @NonNull int[] qualifiedNetworks) {
		this.apnType = apnType;
		this.qualifiedNetworks = Arrays.stream(qualifiedNetworks)
		@@ -313,7 +315,7 @@ public class AccessNetworksManager extends Handler {

		/**
		* Called when QualifiedNetworksService requests network validation.
		*
		* <p>
		* Since the data network in the connected state corresponding to the given network
		* capability must be validated, a request is tossed to the data network controller.
		* @param networkCapability network capability
		@@ -429,7 +431,8 @@ public class AccessNetworksManager extends Handler {
		mPhone.getDataNetworkController().getDataRetryManager().registerCallback(
		new DataRetryManager.DataRetryManagerCallback(this::post) {
		@Override
		public void onThrottleStatusChanged(List<ThrottleStatus> throttleStatuses) {
		public void onThrottleStatusChanged(
		@NonNull List<ThrottleStatus> throttleStatuses) {
		try {
		logl("onThrottleStatusChanged: " + throttleStatuses);
		if (mIQualifiedNetworksService != null) {
		@@ -471,7 +474,7 @@ public class AccessNetworksManager extends Handler {
		*/
		private void bindQualifiedNetworksService() {
		post(() -> {
		Intent intent = null;
		Intent intent;
		String packageName = getQualifiedNetworksServicePackageName();
		String className = getQualifiedNetworksServiceClassName();

		@@ -538,7 +541,7 @@ public class AccessNetworksManager extends Handler {
		b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),
		CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);
		if (b != null && !b.isEmpty()) {
		if (!b.isEmpty()) {
		// If carrier config overrides it, use the one from carrier config
		String carrierConfigPackageName = b.getString(CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);
		@@ -569,7 +572,7 @@ public class AccessNetworksManager extends Handler {
		b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),
		CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);
		if (b != null && !b.isEmpty()) {
		if (!b.isEmpty()) {
		// If carrier config overrides it, use the one from carrier config
		String carrierConfigClassName = b.getString(CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);
		@@ -585,7 +588,8 @@ public class AccessNetworksManager extends Handler {
		return className;
		}

		private @NonNull List<QualifiedNetworks> getQualifiedNetworksList() {
		@NonNull
		private List<QualifiedNetworks> getQualifiedNetworksList() {
		List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();
		for (int i = 0; i < mAvailableNetworks.size(); i++) {
		qualifiedNetworksList.add(new QualifiedNetworks(mAvailableNetworks.keyAt(i),
		@@ -617,11 +621,13 @@ public class AccessNetworksManager extends Handler {
		/**
		* @return The available transports.
		*/
		public @NonNull int[] getAvailableTransports() {
		@NonNull
		public int[] getAvailableTransports() {
		return mAvailableTransports;
		}

		private static @TransportType int getTransportFromAccessNetwork(int accessNetwork) {
		@TransportType
		private static int getTransportFromAccessNetwork(int accessNetwork) {
		return accessNetwork == AccessNetworkType.IWLAN
		? AccessNetworkConstants.TRANSPORT_TYPE_WLAN
		: AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
		@@ -654,7 +660,8 @@ public class AccessNetworksManager extends Handler {
		* @param apnType APN type
		* @return The preferred transport.
		*/
		public @TransportType int getPreferredTransport(@ApnType int apnType) {
		@TransportType
		public int getPreferredTransport(@ApnType int apnType) {
		return mPreferredTransports.get(apnType) == null
		? AccessNetworkConstants.TRANSPORT_TYPE_WWAN : mPreferredTransports.get(apnType);
		}
		@@ -666,8 +673,8 @@ public class AccessNetworksManager extends Handler {
		* supported.)
		* @return The preferred transport.
		*/
		public @TransportType int getPreferredTransportByNetworkCapability(
		@NetCapability int networkCapability) {
		@TransportType
		public int getPreferredTransportByNetworkCapability(@NetCapability int networkCapability) {
		int apnType = DataUtils.networkCapabilityToApnType(networkCapability);
		// For non-APN type capabilities, always route to WWAN.
		if (apnType == ApnSetting.TYPE_NONE) {

src/java/com/android/internal/telephony/data/DataConfigManager.java

+133 −107

Original line number	Diff line number	Diff line
		@@ -200,8 +200,8 @@ public class DataConfigManager extends Handler {
		private @interface DataConfigNetworkType {}

		/** Data config update callbacks. */
		private final @NonNull Set<DataConfigManagerCallback> mDataConfigManagerCallbacks =
		new ArraySet<>();
		@NonNull
		private final Set<DataConfigManagerCallback> mDataConfigManagerCallbacks = new ArraySet<>();

		/** DeviceConfig key of anomaly report threshold for back to back ims release-request. */
		private static final String KEY_ANOMALY_IMS_RELEASE_REQUEST = "anomaly_ims_release_request";
		@@ -266,55 +266,77 @@ public class DataConfigManager extends Handler {
		*/
		private boolean mIsApnConfigAnomalyReportEnabled;

		private @NonNull final Phone mPhone;
		private @NonNull final String mLogTag;

		@NonNull private final FeatureFlags mFeatureFlags;
		private @NonNull final CarrierConfigManager mCarrierConfigManager;
		private @NonNull PersistableBundle mCarrierConfig = null;
		private @NonNull Resources mResources = null;
		@NonNull
		private final Phone mPhone;
		@NonNull
		private final String mLogTag;
		@NonNull
		private final FeatureFlags mFeatureFlags;
		@NonNull
		private final CarrierConfigManager mCarrierConfigManager;
		@NonNull
		private PersistableBundle mCarrierConfig = null;
		@NonNull
		private Resources mResources = null;

		/** The network capability priority map */
		private @NonNull final Map<Integer, Integer> mNetworkCapabilityPriorityMap =
		new ConcurrentHashMap<>();
		@NonNull
		private final Map<Integer, Integer> mNetworkCapabilityPriorityMap = new ConcurrentHashMap<>();
		/** The data setup retry rules */
		private @NonNull final List<DataSetupRetryRule> mDataSetupRetryRules = new ArrayList<>();
		@NonNull
		private final List<DataSetupRetryRule> mDataSetupRetryRules = new ArrayList<>();
		/** The data handover retry rules */
		private @NonNull final List<DataHandoverRetryRule> mDataHandoverRetryRules = new ArrayList<>();
		@NonNull
		private final List<DataHandoverRetryRule> mDataHandoverRetryRules = new ArrayList<>();
		/** The metered APN types for home network */
		private @NonNull final @ApnType Set<Integer> mMeteredApnTypes = new HashSet<>();
		@NonNull
		@ApnType
		private final Set<Integer> mMeteredApnTypes = new HashSet<>();
		/** The metered APN types for roaming network */
		private @NonNull final @ApnType Set<Integer> mRoamingMeteredApnTypes = new HashSet<>();
		@NonNull
		@ApnType
		private final Set<Integer> mRoamingMeteredApnTypes = new HashSet<>();
		/** The network types that only support single data networks */
		private @NonNull final @NetworkType List<Integer> mSingleDataNetworkTypeList =
		new ArrayList<>();
		private @NonNull final @NetCapability Set<Integer> mCapabilitiesExemptFromSingleDataList =
		new HashSet<>();
		@NonNull
		@NetworkType
		private final List<Integer> mSingleDataNetworkTypeList = new ArrayList<>();
		@NonNull
		@NetCapability
		private final Set<Integer> mCapabilitiesExemptFromSingleDataList = new HashSet<>();
		/** The network types that support temporarily not metered */
		private @NonNull final @DataConfigNetworkType Set<String> mUnmeteredNetworkTypes =
		new HashSet<>();
		@NonNull
		@DataConfigNetworkType
		private final Set<String> mUnmeteredNetworkTypes = new HashSet<>();
		/** The network types that support temporarily not metered when roaming */
		private @NonNull final @DataConfigNetworkType Set<String> mRoamingUnmeteredNetworkTypes =
		new HashSet<>();
		@NonNull
		@DataConfigNetworkType
		private final Set<String> mRoamingUnmeteredNetworkTypes = new HashSet<>();
		/** A map of network types to the downlink and uplink bandwidth values for that network type */
		private @NonNull final @DataConfigNetworkType Map<String, DataNetwork.NetworkBandwidth>
		mBandwidthMap = new ConcurrentHashMap<>();
		/** A map of network types to the TCP buffer sizes for that network type */
		private @NonNull final @DataConfigNetworkType Map<String, String> mTcpBufferSizeMap =
		@NonNull
		@DataConfigNetworkType
		private final Map<String, DataNetwork.NetworkBandwidth> mBandwidthMap =
		new ConcurrentHashMap<>();
		/** A map of network types to the TCP buffer sizes for that network type */
		@NonNull
		@DataConfigNetworkType
		private final Map<String, String> mTcpBufferSizeMap = new ConcurrentHashMap<>();
		/** Rules for handover between IWLAN and cellular network. */
		private @NonNull final List<HandoverRule> mHandoverRuleList = new ArrayList<>();
		@NonNull
		private final List<HandoverRule> mHandoverRuleList = new ArrayList<>();
		/** {@code True} keep IMS network in case of moving to non VOPS area; {@code false} otherwise.*/
		private boolean mShouldKeepNetworkUpInNonVops = false;
		/** The set of network types that enable VOPS even in non VOPS area. */
		@NonNull private final @CarrierConfigManager.Ims.NetworkType List<Integer>
		mEnabledVopsNetworkTypesInNonVops = new ArrayList<>();
		@NonNull
		@CarrierConfigManager.Ims.NetworkType
		private final List<Integer> mEnabledVopsNetworkTypesInNonVops = new ArrayList<>();
		/**
		* A map of network types to the estimated downlink values by signal strength 0 - 4 for that
		* network type
		*/
		private @NonNull final @DataConfigNetworkType Map<String, int[]>
		mAutoDataSwitchNetworkTypeSignalMap = new ConcurrentHashMap<>();
		@NonNull
		@DataConfigNetworkType
		private final Map<String, int[]> mAutoDataSwitchNetworkTypeSignalMap =
		new ConcurrentHashMap<>();

		/**
		* Constructor
		@@ -554,14 +576,16 @@ public class DataConfigManager extends Handler {
		/**
		* @return The data setup retry rules from carrier config.
		*/
		public @NonNull List<DataSetupRetryRule> getDataSetupRetryRules() {
		@NonNull
		public List<DataSetupRetryRule> getDataSetupRetryRules() {
		return Collections.unmodifiableList(mDataSetupRetryRules);
		}

		/**
		* @return The data handover retry rules from carrier config.
		*/
		public @NonNull List<DataHandoverRetryRule> getDataHandoverRetryRules() {
		@NonNull
		public List<DataHandoverRetryRule> getDataHandoverRetryRules() {
		return Collections.unmodifiableList(mDataHandoverRetryRules);
		}

		@@ -604,7 +628,9 @@ public class DataConfigManager extends Handler {
		*
		* @return The metered network capabilities when connected to a home network.
		*/
		public @NonNull @NetCapability Set<Integer> getMeteredNetworkCapabilities(boolean isRoaming) {
		@NonNull
		@NetCapability
		public Set<Integer> getMeteredNetworkCapabilities(boolean isRoaming) {
		Set<Integer> meteredApnTypes = isRoaming ? mRoamingMeteredApnTypes : mMeteredApnTypes;
		Set<Integer> meteredCapabilities = meteredApnTypes.stream()
		.map(DataUtils::apnTypeToNetworkCapability)
		@@ -703,7 +729,9 @@ public class DataConfigManager extends Handler {
		/**
		* @return The list of {@link NetworkType} that only supports single data networks
		*/
		public @NonNull @NetworkType List<Integer> getNetworkTypesOnlySupportSingleDataNetwork() {
		@NonNull
		@NetworkType
		public List<Integer> getNetworkTypesOnlySupportSingleDataNetwork() {
		return Collections.unmodifiableList(mSingleDataNetworkTypeList);
		}

		@@ -711,7 +739,9 @@ public class DataConfigManager extends Handler {
		* @return The list of {@link android.net.NetworkCapabilities.NetCapability} that every of which
		* is exempt from the single PDN check.
		*/
		public @NonNull @NetCapability Set<Integer> getCapabilitiesExemptFromSingleDataNetwork() {
		@NonNull
		@NetCapability
		public Set<Integer> getCapabilitiesExemptFromSingleDataNetwork() {
		return Collections.unmodifiableSet(mCapabilitiesExemptFromSingleDataList);
		}

		@@ -844,7 +874,8 @@ public class DataConfigManager extends Handler {
		* @param displayInfo The {@link TelephonyDisplayInfo} to get the bandwidth for.
		* @return The pre-configured bandwidth estimate from carrier config.
		*/
		public @NonNull DataNetwork.NetworkBandwidth getBandwidthForNetworkType(
		@NonNull
		public DataNetwork.NetworkBandwidth getBandwidthForNetworkType(
		@NonNull TelephonyDisplayInfo displayInfo) {
		DataNetwork.NetworkBandwidth bandwidth = mBandwidthMap.get(
		getDataConfigNetworkType(displayInfo));
		@@ -931,7 +962,8 @@ public class DataConfigManager extends Handler {
		* Anomaly report thresholds for frequent setup data call failure.
		* @return EventFrequency to trigger the anomaly report
		*/
		public @NonNull EventFrequency getAnomalySetupDataCallThreshold() {
		@NonNull
		public EventFrequency getAnomalySetupDataCallThreshold() {
		return mSetupDataCallAnomalyReportThreshold;
		}

		@@ -940,7 +972,8 @@ public class DataConfigManager extends Handler {
		* at {@link TelephonyNetworkAgent#onNetworkUnwanted}
		* @return EventFrequency to trigger the anomaly report
		*/
		public @NonNull EventFrequency getAnomalyNetworkUnwantedThreshold() {
		@NonNull
		public EventFrequency getAnomalyNetworkUnwantedThreshold() {
		return mNetworkUnwantedAnomalyReportThreshold;
		}

		@@ -948,7 +981,8 @@ public class DataConfigManager extends Handler {
		* Anomaly report thresholds for back to back release-request of IMS.
		* @return EventFrequency to trigger the anomaly report
		*/
		public @NonNull EventFrequency getAnomalyImsReleaseRequestThreshold() {
		@NonNull
		public EventFrequency getAnomalyImsReleaseRequestThreshold() {
		return mImsReleaseRequestAnomalyReportThreshold;
		}

		@@ -1119,7 +1153,8 @@ public class DataConfigManager extends Handler {
		* @return The TCP configuration string for the given display info or the default value from
		* {@code config_tcp_buffers} if unavailable.
		*/
		public @NonNull String getTcpConfigString(@NonNull TelephonyDisplayInfo displayInfo) {
		@NonNull
		public String getTcpConfigString(@NonNull TelephonyDisplayInfo displayInfo) {
		String config = mTcpBufferSizeMap.get(getDataConfigNetworkType(displayInfo));
		if (TextUtils.isEmpty(config)) {
		config = getDefaultTcpConfigString();
		@@ -1130,7 +1165,8 @@ public class DataConfigManager extends Handler {
		/**
		* @return The fixed TCP buffer size configured based on the device's memory and performance.
		*/
		public @NonNull String getDefaultTcpConfigString() {
		@NonNull
		public String getDefaultTcpConfigString() {
		return mResources.getString(com.android.internal.R.string.config_tcp_buffers);
		}

		@@ -1173,20 +1209,21 @@ public class DataConfigManager extends Handler {
		/**
		* @return The bandwidth estimation source.
		*/
		public @DataNetwork.BandwidthEstimationSource int getBandwidthEstimateSource() {
		@DataNetwork.BandwidthEstimationSource
		public int getBandwidthEstimateSource() {
		String source = mResources.getString(
		com.android.internal.R.string.config_bandwidthEstimateSource);
		switch (source) {
		case BANDWIDTH_SOURCE_MODEM_STRING_VALUE:
		return DataNetwork.BANDWIDTH_SOURCE_MODEM;
		case BANDWIDTH_SOURCE_CARRIER_CONFIG_STRING_VALUE:
		return DataNetwork.BANDWIDTH_SOURCE_CARRIER_CONFIG;
		case BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR_STRING_VALUE:
		return DataNetwork.BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR;
		default:
		return switch (source) {
		case BANDWIDTH_SOURCE_MODEM_STRING_VALUE -> DataNetwork.BANDWIDTH_SOURCE_MODEM;
		case BANDWIDTH_SOURCE_CARRIER_CONFIG_STRING_VALUE ->
		DataNetwork.BANDWIDTH_SOURCE_CARRIER_CONFIG;
		case BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR_STRING_VALUE ->
		DataNetwork.BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR;
		default -> {
		loge("Invalid bandwidth estimation source config: " + source);
		return DataNetwork.BANDWIDTH_SOURCE_UNKNOWN;
		yield DataNetwork.BANDWIDTH_SOURCE_UNKNOWN;
		}
		};
		}

		/**
		@@ -1195,8 +1232,9 @@ public class DataConfigManager extends Handler {
		* @param displayInfo The {@link TelephonyDisplayInfo} used to determine the type.
		* @return The equivalent {@link DataConfigNetworkType}.
		*/
		private static @NonNull @DataConfigNetworkType String getDataConfigNetworkType(
		@NonNull TelephonyDisplayInfo displayInfo) {
		@NonNull
		@DataConfigNetworkType
		private static String getDataConfigNetworkType(@NonNull TelephonyDisplayInfo displayInfo) {
		int networkType = displayInfo.getNetworkType();
		switch (displayInfo.getOverrideNetworkType()) {
		case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED:
		@@ -1305,7 +1343,8 @@ public class DataConfigManager extends Handler {
		*
		* @see CarrierConfigManager#KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY
		*/
		public @NonNull List<HandoverRule> getHandoverRules() {
		@NonNull
		public List<HandoverRule> getHandoverRules() {
		return Collections.unmodifiableList(mHandoverRuleList);
		}

		@@ -1323,52 +1362,33 @@ public class DataConfigManager extends Handler {
		* @param networkType The network type
		* @return The equivalent data config network type
		*/
		private static @NonNull @DataConfigNetworkType String networkTypeToDataConfigNetworkType(
		@NonNull
		@DataConfigNetworkType
		private static String networkTypeToDataConfigNetworkType(
		@NetworkType int networkType) {
		switch (networkType) {
		case TelephonyManager.NETWORK_TYPE_GPRS:
		return DATA_CONFIG_NETWORK_TYPE_GPRS;
		case TelephonyManager.NETWORK_TYPE_EDGE:
		return DATA_CONFIG_NETWORK_TYPE_EDGE;
		case TelephonyManager.NETWORK_TYPE_UMTS:
		return DATA_CONFIG_NETWORK_TYPE_UMTS;
		case TelephonyManager.NETWORK_TYPE_HSDPA:
		return DATA_CONFIG_NETWORK_TYPE_HSDPA;
		case TelephonyManager.NETWORK_TYPE_HSUPA:
		return DATA_CONFIG_NETWORK_TYPE_HSUPA;
		case TelephonyManager.NETWORK_TYPE_HSPA:
		return DATA_CONFIG_NETWORK_TYPE_HSPA;
		case TelephonyManager.NETWORK_TYPE_CDMA:
		return DATA_CONFIG_NETWORK_TYPE_CDMA;
		case TelephonyManager.NETWORK_TYPE_EVDO_0:
		return DATA_CONFIG_NETWORK_TYPE_EVDO_0;
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		return DATA_CONFIG_NETWORK_TYPE_EVDO_A;
		case TelephonyManager.NETWORK_TYPE_EVDO_B:
		return DATA_CONFIG_NETWORK_TYPE_EVDO_B;
		case TelephonyManager.NETWORK_TYPE_1xRTT:
		return DATA_CONFIG_NETWORK_TYPE_1xRTT;
		case TelephonyManager.NETWORK_TYPE_LTE:
		return DATA_CONFIG_NETWORK_TYPE_LTE;
		case TelephonyManager.NETWORK_TYPE_EHRPD:
		return DATA_CONFIG_NETWORK_TYPE_EHRPD;
		case TelephonyManager.NETWORK_TYPE_IDEN:
		return DATA_CONFIG_NETWORK_TYPE_IDEN;
		case TelephonyManager.NETWORK_TYPE_HSPAP:
		return DATA_CONFIG_NETWORK_TYPE_HSPAP;
		case TelephonyManager.NETWORK_TYPE_GSM:
		return DATA_CONFIG_NETWORK_TYPE_GSM;
		case TelephonyManager.NETWORK_TYPE_TD_SCDMA:
		return DATA_CONFIG_NETWORK_TYPE_TD_SCDMA;
		case TelephonyManager.NETWORK_TYPE_IWLAN:
		return DATA_CONFIG_NETWORK_TYPE_IWLAN;
		case TelephonyManager.NETWORK_TYPE_LTE_CA:
		return DATA_CONFIG_NETWORK_TYPE_LTE_CA;
		case TelephonyManager.NETWORK_TYPE_NR:
		return DATA_CONFIG_NETWORK_TYPE_NR_SA;
		default:
		return "";
		}
		return switch (networkType) {
		case TelephonyManager.NETWORK_TYPE_GPRS -> DATA_CONFIG_NETWORK_TYPE_GPRS;
		case TelephonyManager.NETWORK_TYPE_EDGE -> DATA_CONFIG_NETWORK_TYPE_EDGE;
		case TelephonyManager.NETWORK_TYPE_UMTS -> DATA_CONFIG_NETWORK_TYPE_UMTS;
		case TelephonyManager.NETWORK_TYPE_HSDPA -> DATA_CONFIG_NETWORK_TYPE_HSDPA;
		case TelephonyManager.NETWORK_TYPE_HSUPA -> DATA_CONFIG_NETWORK_TYPE_HSUPA;
		case TelephonyManager.NETWORK_TYPE_HSPA -> DATA_CONFIG_NETWORK_TYPE_HSPA;
		case TelephonyManager.NETWORK_TYPE_CDMA -> DATA_CONFIG_NETWORK_TYPE_CDMA;
		case TelephonyManager.NETWORK_TYPE_EVDO_0 -> DATA_CONFIG_NETWORK_TYPE_EVDO_0;
		case TelephonyManager.NETWORK_TYPE_EVDO_A -> DATA_CONFIG_NETWORK_TYPE_EVDO_A;
		case TelephonyManager.NETWORK_TYPE_EVDO_B -> DATA_CONFIG_NETWORK_TYPE_EVDO_B;
		case TelephonyManager.NETWORK_TYPE_1xRTT -> DATA_CONFIG_NETWORK_TYPE_1xRTT;
		case TelephonyManager.NETWORK_TYPE_LTE -> DATA_CONFIG_NETWORK_TYPE_LTE;
		case TelephonyManager.NETWORK_TYPE_EHRPD -> DATA_CONFIG_NETWORK_TYPE_EHRPD;
		case TelephonyManager.NETWORK_TYPE_IDEN -> DATA_CONFIG_NETWORK_TYPE_IDEN;
		case TelephonyManager.NETWORK_TYPE_HSPAP -> DATA_CONFIG_NETWORK_TYPE_HSPAP;
		case TelephonyManager.NETWORK_TYPE_GSM -> DATA_CONFIG_NETWORK_TYPE_GSM;
		case TelephonyManager.NETWORK_TYPE_TD_SCDMA -> DATA_CONFIG_NETWORK_TYPE_TD_SCDMA;
		case TelephonyManager.NETWORK_TYPE_IWLAN -> DATA_CONFIG_NETWORK_TYPE_IWLAN;
		case TelephonyManager.NETWORK_TYPE_LTE_CA -> DATA_CONFIG_NETWORK_TYPE_LTE_CA;
		case TelephonyManager.NETWORK_TYPE_NR -> DATA_CONFIG_NETWORK_TYPE_NR_SA;
		default -> "";
		};
		}

		/**
		@@ -1376,7 +1396,8 @@ public class DataConfigManager extends Handler {
		*
		* @see CarrierConfigManager#KEY_DATA_STALL_RECOVERY_TIMERS_LONG_ARRAY
		*/
		public @NonNull long[] getDataStallRecoveryDelayMillis() {
		@NonNull
		public long[] getDataStallRecoveryDelayMillis() {
		return mCarrierConfig.getLongArray(
		CarrierConfigManager.KEY_DATA_STALL_RECOVERY_TIMERS_LONG_ARRAY);
		}
		@@ -1386,7 +1407,8 @@ public class DataConfigManager extends Handler {
		*
		* @see CarrierConfigManager#KEY_DATA_STALL_RECOVERY_SHOULD_SKIP_BOOL_ARRAY
		*/
		public @NonNull boolean[] getDataStallRecoveryShouldSkipArray() {
		@NonNull
		public boolean[] getDataStallRecoveryShouldSkipArray() {
		return mCarrierConfig.getBooleanArray(
		CarrierConfigManager.KEY_DATA_STALL_RECOVERY_SHOULD_SKIP_BOOL_ARRAY);
		}
		@@ -1395,7 +1417,8 @@ public class DataConfigManager extends Handler {
		* @return The default preferred APN. An empty string if not configured. This is used for the
		* first time boot up where preferred APN is not set.
		*/
		public @NonNull String getDefaultPreferredApn() {
		@NonNull
		public String getDefaultPreferredApn() {
		return TextUtils.emptyIfNull(mCarrierConfig.getString(
		CarrierConfigManager.KEY_DEFAULT_PREFERRED_APN_NAME_STRING));
		}
		@@ -1414,7 +1437,9 @@ public class DataConfigManager extends Handler {
		* cases that we need to use "user-added" APN for initial attach. The regular way to configure
		* IA APN is by adding "IA" type to the APN in APN config.
		*/
		public @NonNull @ApnType List<Integer> getAllowedInitialAttachApnTypes() {
		@NonNull
		@ApnType
		public List<Integer> getAllowedInitialAttachApnTypes() {
		String[] apnTypesArray = mCarrierConfig.getStringArray(
		CarrierConfigManager.KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY);
		if (apnTypesArray != null) {
		@@ -1461,7 +1486,8 @@ public class DataConfigManager extends Handler {
		/**
		* @return The capabilities that network will be forced to mark as cellular transport.
		*/
		public @NetCapability Set<Integer> getForcedCellularTransportCapabilities() {
		@NetCapability
		public Set<Integer> getForcedCellularTransportCapabilities() {
		String[] forcedCellularTransportCapabilities = mResources.getStringArray(
		com.android.internal.R.array.config_force_cellular_transport_capabilities);