Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f93242 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable by carrier" am: 99f5d0a0 am: fd0e7112 

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



Change-Id: I42aa8eabd5d0ff5ebc7ce9125d98f35ff43f688b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 697e6f62 fd0e7112

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS";

    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_RECIPIENT_LIMIT_INT = "recipientLimit";

    field public static final String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages";

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,16 @@ public class CarrierConfigManager { 
     * is immediately closed (disabling keep-alive).

     */

    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
@@ -8889,6 +8899,7 @@ public class CarrierConfigManager { 
        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_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_HTTP_PARAMS_STRING, "");

        sDefaults.putString(KEY_MMS_NAI_SUFFIX_STRING, "");