diff options
| author | 2020-01-17 21:36:39 +0000 | |
|---|---|---|
| committer | 2020-01-17 21:36:39 +0000 | |
| commit | bccd39ed2898bac38d1bf930f0b5e77449deb214 (patch) | |
| tree | 47a9c90cf0f6a4ef76ee7f85e4873eb5bf3c4374 | |
| parent | 5cdde8b871c1da19ef650483313c32b97a7ac257 (diff) | |
| parent | 102bafea2f012262d44508ffd165bc22545dbdb8 (diff) | |
Merge "Expose MMS constants" am: 9681a661ae am: 102bafea2f
Change-Id: Ic7fbf24bbeb713585cd5143c58debb7f807a38ae
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsManager.java | 10 |
3 files changed, 5 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index 713c3d5cff2e..25269d961112 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44558,6 +44558,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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 607b7d98a1de..8313630adf09 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1576,7 +1576,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"; /** diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index db90550c5331..b5dea7c02148 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -2425,16 +2425,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. * |