Snap for 8378100 from 2dd5958c15238b97d0df48864dc4ddfb68cd5ded to tm-d1-release (0d7b8566) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ public class GsmCdmaPhone extends Phone {
		.makeCarrierSignalAgent(this);
		mAccessNetworksManager = mTelephonyComponentFactory
		.inject(AccessNetworksManager.class.getName())
		.makeAccessNetworksManager(this);
		.makeAccessNetworksManager(this, getLooper());
		if (!isUsingNewDataStack()) {
		mTransportManager = mTelephonyComponentFactory.inject(TransportManager.class.getName())
		.makeTransportManager(this);

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -412,10 +412,11 @@ public class TelephonyComponentFactory {
		* Make access networks manager
		*
		* @param phone The phone instance
		* @param looper Looper for the handler.
		* @return The access networks manager
		*/
		public AccessNetworksManager makeAccessNetworksManager(Phone phone) {
		return new AccessNetworksManager(phone);
		public AccessNetworksManager makeAccessNetworksManager(Phone phone, Looper looper) {
		return new AccessNetworksManager(phone, looper);
		}

		public CdmaSubscriptionSourceManager

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

+59 −22

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.content.ServiceConnection;
		import android.content.pm.PackageManager;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.PersistableBundle;
		import android.os.Registrant;
		import android.os.RegistrantList;
		@@ -36,6 +37,7 @@ import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.AccessNetworkType;
		import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.Annotation.ApnType;
		import android.telephony.Annotation.NetCapability;
		@@ -173,6 +175,9 @@ public class AccessNetworksManager extends Handler {
		* transport. The preferred transports are updated as soon as QNS changes the preference, while
		* the current transports are updated after handover complete.
		*/
		// TODO: Deprecate mPreferredTransports. Should expose mAvailableNetworks to
		// DataNetworkController after we support multi preferred access networks (i.e.
		// DataNetworkController might select 2nd preferred access network in some scenarios.)
		private final Map<Integer, Integer> mPreferredTransports = new ConcurrentHashMap<>();

		/**
		@@ -202,23 +207,23 @@ public class AccessNetworksManager extends Handler {
		public static class QualifiedNetworks {
		public final @ApnType int apnType;
		// The qualified networks in preferred order. Each network is a AccessNetworkType.
		public final int[] qualifiedNetworks;
		public QualifiedNetworks(@ApnType int apnType, int[] qualifiedNetworks) {
		public final @NonNull @RadioAccessNetworkType int[] qualifiedNetworks;
		public QualifiedNetworks(@ApnType int apnType, @NonNull int[] qualifiedNetworks) {
		this.apnType = apnType;
		this.qualifiedNetworks = qualifiedNetworks;
		this.qualifiedNetworks = Arrays.stream(qualifiedNetworks)
		.boxed()
		.filter(DataUtils::isValidAccessNetwork)
		.mapToInt(Integer::intValue)
		.toArray();
		}

		@Override
		public String toString() {
		List<String> accessNetworkStrings = new ArrayList<>();
		for (int network : qualifiedNetworks) {
		accessNetworkStrings.add(AccessNetworkType.toString(network));
		}
		return "[QualifiedNetworks: apnType="
		+ ApnSetting.getApnTypeString(apnType)
		+ ", networks="
		+ Arrays.stream(qualifiedNetworks)
		.mapToObj(type -> AccessNetworkType.toString(type))
		.mapToObj(AccessNetworkType::toString)
		.collect(Collectors.joining(","))
		+ "]";
		}
		@@ -322,27 +327,57 @@ public class AccessNetworksManager extends Handler {
		private final class QualifiedNetworksServiceCallback extends
		IQualifiedNetworksServiceCallback.Stub {
		@Override
		public void onQualifiedNetworkTypesChanged(int apnTypes, int[] qualifiedNetworkTypes) {
		log("onQualifiedNetworkTypesChanged. apnTypes = ["
		public void onQualifiedNetworkTypesChanged(int apnTypes,
		@NonNull int[] qualifiedNetworkTypes) {
		if (qualifiedNetworkTypes == null) {
		loge("onQualifiedNetworkTypesChanged: Ignored null input.");
		return;
		}

		log("onQualifiedNetworkTypesChanged: apnTypes = ["
		+ ApnSetting.getApnTypesStringFromBitmask(apnTypes)
		+ "], networks = [" + Arrays.stream(qualifiedNetworkTypes)
		.mapToObj(i -> AccessNetworkType.toString(i)).collect(Collectors.joining(","))
		.mapToObj(AccessNetworkType::toString).collect(Collectors.joining(","))
		+ "]");

		if (Arrays.stream(qualifiedNetworkTypes).anyMatch(accessNetwork
		-> !DataUtils.isValidAccessNetwork(accessNetwork))) {
		loge("Invalid access networks " + Arrays.toString(qualifiedNetworkTypes));
		return;
		}

		List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();
		for (int supportedApnType : SUPPORTED_APN_TYPES) {
		if ((apnTypes & supportedApnType) == supportedApnType) {
		if (mAvailableNetworks.get(supportedApnType) != null) {
		if (Arrays.equals(mAvailableNetworks.get(supportedApnType),
		for (int apnType : SUPPORTED_APN_TYPES) {
		if ((apnTypes & apnType) == apnType) {
		if (mAvailableNetworks.get(apnType) != null) {
		if (Arrays.equals(mAvailableNetworks.get(apnType),
		qualifiedNetworkTypes)) {
		log("Available networks for "
		+ ApnSetting.getApnTypesStringFromBitmask(supportedApnType)
		+ ApnSetting.getApnTypesStringFromBitmask(apnType)
		+ " not changed.");
		continue;
		}
		}
		mAvailableNetworks.put(supportedApnType, qualifiedNetworkTypes);
		qualifiedNetworksList.add(new QualifiedNetworks(supportedApnType,

		// Empty array indicates QNS did not suggest any qualified networks. In this
		// case all network requests will be routed to cellular.
		if (qualifiedNetworkTypes.length == 0) {
		mAvailableNetworks.remove(apnType);
		if (getPreferredTransport(apnType)
		== AccessNetworkConstants.TRANSPORT_TYPE_WLAN) {
		mPreferredTransports.put(apnType,
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		mAccessNetworksManagerCallbacks.forEach(callback ->
		callback.invokeFromExecutor(() ->
		callback.onPreferredTransportChanged(DataUtils
		.apnTypeToNetworkCapability(apnType))));
		}
		} else {
		mAvailableNetworks.put(apnType, qualifiedNetworkTypes);
		qualifiedNetworksList.add(new QualifiedNetworks(apnType,
		qualifiedNetworkTypes));

		}
		}
		}

		@@ -377,9 +412,11 @@ public class AccessNetworksManager extends Handler {
		/**
		* Constructor
		*
		* @param phone The phone object
		* @param phone The phone object.
		* @param looper Looper for the handler.
		*/
		public AccessNetworksManager(Phone phone) {
		public AccessNetworksManager(@NonNull Phone phone, @NonNull Looper looper) {
		super(looper);
		mPhone = phone;
		mCarrierConfigManager = (CarrierConfigManager) phone.getContext().getSystemService(
		Context.CARRIER_CONFIG_SERVICE);
		@@ -657,11 +694,11 @@ public class AccessNetworksManager extends Handler {
		if (networks.qualifiedNetworks.length > 0) {
		int transport = getTransportFromAccessNetwork(networks.qualifiedNetworks[0]);
		if (getPreferredTransport(networks.apnType) != transport) {
		mPreferredTransports.put(networks.apnType, transport);
		mAccessNetworksManagerCallbacks.forEach(callback ->
		callback.invokeFromExecutor(() ->
		callback.onPreferredTransportChanged(DataUtils
		.apnTypeToNetworkCapability(networks.apnType))));
		mPreferredTransports.put(networks.apnType, transport);
		logl("setPreferredTransports: apnType="
		+ ApnSetting.getApnTypeString(networks.apnType) + ", transport="
		+ AccessNetworkConstants.transportTypeToString(transport));

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

+54 −7

Original line number	Diff line number	Diff line
		@@ -217,6 +217,9 @@ public class DataConfigManager extends Handler {
		/** 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 =
		new ConcurrentHashMap<>();
		/** Rules for handover between IWLAN and cellular network. */
		private @NonNull final List<HandoverRule> mHandoverRuleList = new ArrayList<>();

		@@ -293,6 +296,7 @@ public class DataConfigManager extends Handler {
		updateSingleDataNetworkTypeList();
		updateUnmeteredNetworkTypes();
		updateBandwidths();
		updateTcpBuffers();
		updateHandoverRules();

		log("Data config updated. Config is " + (isConfigCarrierSpecific() ? "" : "not ")
		@@ -625,18 +629,57 @@ public class DataConfigManager extends Handler {
		return mCarrierConfig.getInt(CarrierConfigManager.KEY_DEFAULT_MTU_INT);
		}

		/**
		* Update the TCP buffer sizes from the resource overlays.
		*/
		private void updateTcpBuffers() {
		synchronized (this) {
		mTcpBufferSizeMap.clear();
		String[] configs = mResources.getStringArray(
		com.android.internal.R.array.config_network_type_tcp_buffers);
		if (configs != null) {
		for (String config : configs) {
		// split[0] = network type as string
		// split[1] = rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
		String[] split = config.split(":");
		if (split.length != 2) {
		loge("Invalid TCP buffer sizes entry: " + config);
		continue;
		}
		if (split[1].split(",").length != 6) {
		loge("Invalid TCP buffer sizes for " + split[0] + ": " + split[1]);
		continue;
		}
		mTcpBufferSizeMap.put(split[0], split[1]);
		}
		}
		}
		}

		/**
		* Get the TCP config string, used by {@link LinkProperties#setTcpBufferSizes(String)}.
		* The config string will have the following form, with values in bytes:
		* "read_min,read_default,read_max,write_min,write_default,write_max"
		*
		* Note that starting from Android 13, the TCP buffer size is fixed after boot up, and should
		* never be changed based on carriers or the network types. The value should be configured
		* appropriately based on the device's memory and performance.
		*
		* @return The TCP configuration string.
		* @param networkType The network type. Note that {@link TelephonyManager#NETWORK_TYPE_LTE_CA}
		* can be used for LTE CA even though it's not a radio access technology.
		* @param serviceState The service state, used to determine NR state.
		* @return The TCP configuration string for the given network type or the default value from
		* config_tcp_buffers if unavailable.
		*/
		public @NonNull String getTcpConfigString() {
		public @NonNull String getTcpConfigString(@NetworkType int networkType,
		@NonNull ServiceState serviceState) {
		String config = mTcpBufferSizeMap.get(getDataConfigNetworkType(networkType, serviceState));
		if (TextUtils.isEmpty(config)) {
		config = getDefaultTcpConfigString();
		}
		return config;
		}

		/**
		* @return The fixed TCP buffer size configured based on the device's memory and performance.
		*/
		public @NonNull String getDefaultTcpConfigString() {
		return mResources.getString(com.android.internal.R.string.config_tcp_buffers);
		}

		@@ -932,7 +975,11 @@ public class DataConfigManager extends Handler {
		+ shouldResetDataThrottlingWhenTacChanges());
		pw.println("Data service package name=" + getDataServicePackageName());
		pw.println("Default MTU=" + getDefaultMtu());
		pw.println("TCP buffer sizes:" + getTcpConfigString());
		pw.println("TCP buffer sizes by RAT:");
		pw.increaseIndent();
		mTcpBufferSizeMap.forEach((key, value) -> pw.println(key + ":" + value));
		pw.decreaseIndent();
		pw.println("Default TCP buffer sizes=" + getDefaultTcpConfigString());
		pw.println("getImsDeregistrationDelay=" + getImsDeregistrationDelay());
		pw.println("shouldPersistIwlanDataNetworksWhenDataServiceRestarted="
		+ shouldPersistIwlanDataNetworksWhenDataServiceRestarted());

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,9 @@ public class DataEvaluation {
		/** VoPS is not supported by the network. */
		VOPS_NOT_SUPPORTED(true),
		/** Only one data network is allowed at one time. */
		ONLY_ALLOWED_SINGLE_NETWORK(true);
		ONLY_ALLOWED_SINGLE_NETWORK(true),
		/** Data enabled settings are not ready. */
		DATA_SETTINGS_NOT_READY(true);

		private final boolean mIsHardReason;