Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable by carrier" am: 99f5d0a07d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2334667

Change-Id: I9244e5daeb36015b4fa7aa69b77b37f0f8f527cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thomas Nguyen
2022-12-09 17:40:28 +00:00
committed by Automerger Merge Worker
parent 75e17d6783 99f5d0a07d
commit fd0e7112bc
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -41392,6 +41392,7 @@ package android.telephony {
field public static final String KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL = "enableMMSReadReports"; field public static final String KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL = "enableMMSReadReports";
field public static final String KEY_MMS_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS"; field public static final String KEY_MMS_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS";
field public static final String KEY_MMS_NAI_SUFFIX_STRING = "naiSuffix"; field public static final String KEY_MMS_NAI_SUFFIX_STRING = "naiSuffix";
field public static final String KEY_MMS_NETWORK_RELEASE_TIMEOUT_MILLIS_INT = "mms_network_release_timeout_millis_int";
field public static final String KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL = "enabledNotifyWapMMSC"; field public static final String KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL = "enabledNotifyWapMMSC";
field public static final String KEY_MMS_RECIPIENT_LIMIT_INT = "recipientLimit"; field public static final String KEY_MMS_RECIPIENT_LIMIT_INT = "recipientLimit";
field public static final String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages"; field public static final String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages";

11
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2112,6 +2112,16 @@ public class CarrierConfigManager {
* is immediately closed (disabling keep-alive). * is immediately closed (disabling keep-alive).
*/ */
public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection"; public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";
/**
* Waiting time in milliseconds used before releasing an MMS data call. Not tearing down an MMS
* data connection immediately helps to reduce the message delivering latency if messaging
* continues between all parties in the conversation since the same data connection can be
* reused for further messages.
*
* This timer will control how long the data call will be kept alive before being torn down.
*/
public static final String KEY_MMS_NETWORK_RELEASE_TIMEOUT_MILLIS_INT =
"mms_network_release_timeout_millis_int";
/** /**
* The flatten {@link android.content.ComponentName componentName} of the activity that can * The flatten {@link android.content.ComponentName componentName} of the activity that can
@@ -8868,6 +8878,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT, -1); sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT, -1);
sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT, -1); sDefaults.putInt(KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT, -1);
sDefaults.putInt(KEY_MMS_SUBJECT_MAX_LENGTH_INT, 40); sDefaults.putInt(KEY_MMS_SUBJECT_MAX_LENGTH_INT, 40);
sDefaults.putInt(KEY_MMS_NETWORK_RELEASE_TIMEOUT_MILLIS_INT, 5 * 1000);
sDefaults.putString(KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, ""); sDefaults.putString(KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, "");
sDefaults.putString(KEY_MMS_HTTP_PARAMS_STRING, ""); sDefaults.putString(KEY_MMS_HTTP_PARAMS_STRING, "");
sDefaults.putString(KEY_MMS_NAI_SUFFIX_STRING, ""); sDefaults.putString(KEY_MMS_NAI_SUFFIX_STRING, "");