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

Commit b8f22589 authored by Ye Wen's avatar Ye Wen Committed by android-build-merger
Browse files

Merge \\"Add carrier config for close connection after MMS request\\" into... 

Merge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1-dev am: f2598319
am: 2395da5e

Change-Id: Ia6a5877bf5ca52cf65b2ee7a85642a00b208428f
parents 0de90ccc 2395da5e

telephony/java/android/telephony/CarrierConfigManager.java

+3 −0
Original line number Diff line number Diff line
@@ -697,6 +697,8 @@ public class CarrierConfigManager { 
    public static final String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";

    public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";

    public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";

    /** @hide */

    public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";



    /**

     * If carriers require differentiate un-provisioned status: cold sim or out of credit sim
@@ -1011,6 +1013,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL, true);

        sDefaults.putBoolean(KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL, false);

        sDefaults.putBoolean(KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL, true);

        sDefaults.putBoolean(KEY_MMS_CLOSE_CONNECTION_BOOL, false);

        sDefaults.putInt(KEY_MMS_ALIAS_MAX_CHARS_INT, 48);

        sDefaults.putInt(KEY_MMS_ALIAS_MIN_CHARS_INT, 2);

        sDefaults.putInt(KEY_MMS_HTTP_SOCKET_TIMEOUT_INT, 60 * 1000);