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

Commit 8cdcce29 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose MMS constants" am: 9681a661 am: 102bafea am: bccd39ed 

Change-Id: I857db2796c0a712ac19ecee21dbe5ccabbd50e18
parents 2d16d372 bccd39ed

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45391,6 +45391,7 @@ package android.telephony { 
    field public static final String KEY_MMS_ALIAS_MIN_CHARS_INT = "aliasMinChars";

    field public static final String KEY_MMS_ALLOW_ATTACH_AUDIO_BOOL = "allowAttachAudio";

    field public static final String KEY_MMS_APPEND_TRANSACTION_ID_BOOL = "enabledTransID";

    field public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";

    field public static final String KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING = "emailGatewayNumber";

    field public static final String KEY_MMS_GROUP_MMS_ENABLED_BOOL = "enableGroupMms";

    field public static final String KEY_MMS_HTTP_PARAMS_STRING = "httpParams";

telephony/java/android/telephony/CarrierConfigManager.java

+4 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,10 @@ 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 */

    /**

     * If true, add "Connection: close" header to MMS HTTP requests so the connection

     * is immediately closed (disabling keep-alive).

     */

    public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";



    /**

telephony/java/android/telephony/SmsManager.java

+0 −10
Original line number Diff line number Diff line
@@ -2545,16 +2545,6 @@ public final class SmsManager { 
    /** Intent extra name for HTTP status code for MMS HTTP failure in integer type */

    public static final String EXTRA_MMS_HTTP_STATUS = "android.telephony.extra.MMS_HTTP_STATUS";



    /** Represents the received SMS message for importing {@hide} */

    public static final int SMS_TYPE_INCOMING = 0;

    /** Represents the sent SMS message for importing {@hide} */

    public static final int SMS_TYPE_OUTGOING = 1;



    /** Message status property: whether the message has been seen. 1 means seen, 0 not {@hide} */

    public static final String MESSAGE_STATUS_SEEN = "seen";

    /** Message status property: whether the message has been read. 1 means read, 0 not {@hide} */

    public static final String MESSAGE_STATUS_READ = "read";



    /**

     * Get carrier-dependent MMS configuration values.

     *