From 58c5b00293a97ff7e05b107516eb8758957378e5 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Wed, 15 Jan 2020 16:40:08 -0800 Subject: Expose MMS constants Unhide CarrierConfigManager#KEY_MMS_CLOSE_CONNECTION_BOOL Move constants from SmsManager to MmsService Test: m MmsServiceRoboTests && atest MmsServiceRoboTests Bug: 147447171 Change-Id: I68f33b862f0607aa45d767e40c1bf24625dfd093 --- api/current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 5 ++++- 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 a1cb0eb65dce..eb02fc611b03 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 cfa4691b491f..5614cc2ab215 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. * -- cgit v1.2.3-59-g8ed1b