[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 76705d193a -s ours am: 55cdc4e43b -s ours
am skip reason: Merged-In I66f4c83c597d58648d56b95f55f3091a1bb550be with SHA-1 8387095809 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/services/Mms/+/3514736
Change-Id: Ic2c2efa889baee1baa1daf1e994f2cfb8e869dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/mms/service/MmsNetworkManager.java b/src/com/android/mms/service/MmsNetworkManager.java
index 91ff3dd..64d7b97 100644
--- a/src/com/android/mms/service/MmsNetworkManager.java
+++ b/src/com/android/mms/service/MmsNetworkManager.java
@@ -38,7 +38,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.flags.Flags;
import com.android.mms.service.exception.MmsNetworkException;
/**
@@ -250,8 +249,8 @@
// New available network
if (mNetwork == null && isAvailable) {
- mIsSatelliteTransport = Flags.satelliteInternet()
- && nc.hasTransport(NetworkCapabilities.TRANSPORT_SATELLITE);
+ mIsSatelliteTransport = nc.hasTransport(
+ NetworkCapabilities.TRANSPORT_SATELLITE);
mNetwork = network;
MmsNetworkManager.this.notifyAll();
}
@@ -302,16 +301,14 @@
// With Satellite internet support, add satellite transport with restricted capability to
// support mms over satellite network
- if (Flags.satelliteInternet()) {
- builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
- try {
- // TODO: b/331622062 remove the try/catch
- builder.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE);
- builder.removeCapability(NetworkCapabilities
- .NET_CAPABILITY_NOT_BANDWIDTH_CONSTRAINED);
- } catch (IllegalArgumentException exception) {
- LogUtil.e("TRANSPORT_SATELLITE or NOT_BANDWIDTH_CONSTRAINED is not supported.");
- }
+ builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
+ try {
+ // TODO: b/331622062 remove the try/catch
+ builder.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE);
+ builder.removeCapability(NetworkCapabilities
+ .NET_CAPABILITY_NOT_BANDWIDTH_CONSTRAINED);
+ } catch (IllegalArgumentException exception) {
+ LogUtil.e("TRANSPORT_SATELLITE or NOT_BANDWIDTH_CONSTRAINED is not supported.");
}
mNetworkRequest = builder.build();
diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index 8b68d48..bc0233b 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -240,8 +240,7 @@
}
LogUtil.d(requestId, "Using APN " + apn);
- if (Flags.carrierEnabledSatelliteFlag()
- && networkManager.isSatelliteTransport()
+ if (networkManager.isSatelliteTransport()
&& !canTransferPayloadOnCurrentNetwork()) {
LogUtil.e(requestId, "PDU too large for satellite");
result = SmsManager.MMS_ERROR_TOO_LARGE_FOR_TRANSPORT;
@@ -692,6 +691,6 @@
.getInt(CarrierConfigManager.KEY_MMS_MAX_NTN_PAYLOAD_SIZE_BYTES_INT);
LogUtil.d("canTransferPayloadOnCurrentNetwork payloadSize: " + payloadSize
+ " maxPduSize: " + maxPduSize);
- return payloadSize > 0 && payloadSize <= maxPduSize;
+ return payloadSize > 0 && (maxPduSize == -1 || payloadSize <= maxPduSize);
}
}
diff --git a/src/com/android/mms/service/metrics/MmsStats.java b/src/com/android/mms/service/metrics/MmsStats.java
index dec5129..0e52d14 100644
--- a/src/com/android/mms/service/metrics/MmsStats.java
+++ b/src/com/android/mms/service/metrics/MmsStats.java
@@ -236,10 +236,6 @@
/** Determines whether device is non-terrestrial network or not. */
private boolean isUsingNonTerrestrialNetwork() {
- if (!Flags.carrierEnabledSatelliteFlag()) {
- return false;
- }
-
ServiceState ss = mTelephonyManager.getServiceState();
if (ss != null) {
return ss.isUsingNonTerrestrialNetwork();
diff --git a/tests/unittests/src/com/android/mms/service/metrics/MmsStatsTest.java b/tests/unittests/src/com/android/mms/service/metrics/MmsStatsTest.java
index 3350e53..2de909e 100644
--- a/tests/unittests/src/com/android/mms/service/metrics/MmsStatsTest.java
+++ b/tests/unittests/src/com/android/mms/service/metrics/MmsStatsTest.java
@@ -229,10 +229,6 @@
@Test
public void testIsNtn_serviceState_notNull() {
- if (!Flags.carrierEnabledSatelliteFlag()) {
- return;
- }
-
ServiceState serviceState = mock(ServiceState.class);
doReturn(serviceState).when(mTelephonyManager).getServiceState();
doReturn(true).when(serviceState).isUsingNonTerrestrialNetwork();
@@ -262,10 +258,6 @@
@Test
public void testIsNtn_serviceState_Null() {
- if (!Flags.carrierEnabledSatelliteFlag()) {
- return;
- }
-
doReturn(null).when(mTelephonyManager).getServiceState();
MmsStats mmsStats = new MmsStats(mContext, mPersistMmsAtomsStorage, 1,