Merge "Remove try catch for TANSPORT_SATELLITE" into main (1cf159b0) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -2346,13 +2346,7 @@ public class DataNetwork extends StateMachine {
		if (mFlags.satelliteInternet() && mIsSatellite
		&& mDataConfigManager.getForcedCellularTransportCapabilities().stream()
		.noneMatch(this::hasNetworkCapabilityInNetworkRequests)) {
		// TODO: b/328622096 remove the try/catch
		try {
		builder.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE);
		} catch (IllegalArgumentException exception) {
		loge("TRANSPORT_SATELLITE is not supported.");
		builder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
		}
		} else {
		builder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
		}

+1 −7

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ public class TelephonyNetworkProvider extends NetworkProvider implements Network
		public NetworkCapabilities makeNetworkFilter() {
		final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder()
		.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
		.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE)
		.addCapability(NetworkCapabilities.NET_CAPABILITY_IA)
		.addCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL)
		.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
		@@ -256,13 +257,6 @@ public class TelephonyNetworkProvider extends NetworkProvider implements Network
		TelephonyNetworkRequest.getAllSupportedNetworkCapabilities()
		.forEach(builder::addCapability);

		// TODO: b/328622096 remove the try/catch
		try {
		builder.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE);
		} catch (IllegalArgumentException exception) {
		log("TRANSPORT_SATELLITE is not supported.");
		}

		return builder.build();
		}