diff options
| author | 2024-01-26 21:11:13 +0000 | |
|---|---|---|
| committer | 2024-01-26 21:11:13 +0000 | |
| commit | e3b7288be9bbe2b532bc3ae19bf42f1239c101e4 (patch) | |
| tree | a25f9e474b222ec9f53e2ebaf4cdc3bb493447ab | |
| parent | 9dcdc9699607f80c3a38f8b116c2b5324f6cec43 (diff) | |
| parent | a718863cd3bade514ebdf8f478ac11ffff207b89 (diff) | |
Merge "Add a new MMS result code for large MMS denial over satellite" into main
| -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 a73c46b12c53..e5a94c302c89 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 @@ -10376,6 +10384,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 */ |