diff options
| author | 2023-12-07 17:46:35 +0000 | |
|---|---|---|
| committer | 2024-01-26 18:18:01 +0000 | |
| commit | a718863cd3bade514ebdf8f478ac11ffff207b89 (patch) | |
| tree | 9056b875a092d96a509f8cd18cb89eebf4b01cef | |
| parent | 5b4e13aaa4c532aa2e4bb619ccc785cd3f20487a (diff) | |
Add a new MMS result code for large MMS denial over satellite
When connected to a satellte, MmsService will block sending or
downloading MMS's over a certain size limit. It will return this
new result code to the calling app if the MMS is too big to send
or download while connected to a satellite.
Bug: 304563798
Test: atest MmsRequestRoboTest
Change-Id: I339f5ceef08732ef2b842e5e93bf5c7974e1028a
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsManager.java | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 73c26a3e5fc9..9353f7363406 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2179,6 +2179,14 @@ public class CarrierConfigManager { */ public static final String KEY_MMS_NETWORK_RELEASE_TIMEOUT_MILLIS_INT = "mms_network_release_timeout_millis_int"; + /** + * Maximum size in bytes of the PDU to send or download when connected to a non-terrestrial + * network. MmsService will return a result code of MMS_ERROR_TOO_LARGE_FOR_TRANSPORT if + * the PDU exceeds this limit when connected to a non-terrestrial network. + * @hide + */ + public static final String KEY_MMS_MAX_NTN_PAYLOAD_SIZE_BYTES_INT = + "mms_max_ntn_payload_size_bytes_int"; /** * The flatten {@link android.content.ComponentName componentName} of the activity that can @@ -10365,6 +10373,7 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT, -1); sDefaults.putInt(KEY_MMS_SUBJECT_MAX_LENGTH_INT, 40); sDefaults.putInt(KEY_MMS_NETWORK_RELEASE_TIMEOUT_MILLIS_INT, 5 * 1000); + sDefaults.putInt(KEY_MMS_MAX_NTN_PAYLOAD_SIZE_BYTES_INT, 3 * 1000); sDefaults.putString(KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, ""); sDefaults.putString(KEY_MMS_HTTP_PARAMS_STRING, ""); sDefaults.putString(KEY_MMS_NAI_SUFFIX_STRING, ""); diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index c958aba1d758..b7baabf7c319 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -3123,6 +3123,12 @@ public final class SmsManager { @FlaggedApi(Flags.FLAG_MMS_DISABLED_ERROR) public static final int MMS_ERROR_MMS_DISABLED_BY_CARRIER = 12; + /** + * The MMS pdu was too large to send or too large to download over the current connection. + * @hide + */ + public static final int MMS_ERROR_TOO_LARGE_FOR_TRANSPORT = 13; + /** Intent extra name for MMS sending result data in byte array type */ public static final String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA"; /** Intent extra name for HTTP status code for MMS HTTP failure in integer type */ |