Merge "Configure Satellite mode to allow applications to bypass default file size limitations." into main
diff --git a/OWNERS b/OWNERS
index 1befe3e..0e102e3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -4,6 +4,4 @@
tomtaylor@google.com
afurtado@google.com
jianxiangp@google.com
-stephshi@google.com
-bellavicevh@google.com
sasindran@google.com
diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index 5208cc2..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;
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,