Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d1dcc17: am abdf79ab: Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev

Browse Source 
* commit '8d1dcc1701d9d2c751272ad8525f1cba3793404c':
  Revert "Migrating MmsConfig to CarrierConfigManager."
This commit is contained in:
Jonathan Basseri
2015-06-02 21:43:37 +00:00
committed by Android Git Automerger
parent 64d548b90f 8d1dcc1701
commit 48cdd81fb3
3 changed files with 1 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/current.txt
View File

@@ -30634,20 +30634,6 @@ package android.telephony {
field public static final java.lang.String BOOL_HAS_IN_CALL_NOISE_SUPPRESSION = "bool_has_in_call_noise_suppression";
field public static final java.lang.String BOOL_HIDE_CARRIER_NETWORK_SETTINGS = "bool_hide_carrier_network_settings";
field public static final java.lang.String BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS = "bool_ignore_sim_network_locked_events";
field public static final java.lang.String BOOL_MMS_ALIAS_ENABLED = "aliasEnabled";
field public static final java.lang.String BOOL_MMS_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
field public static final java.lang.String BOOL_MMS_APPEND_TRANSACTION_ID = "enabledTransID";
field public static final java.lang.String BOOL_MMS_GROUP_MMS_ENABLED = "enableGroupMms";
field public static final java.lang.String BOOL_MMS_MMS_DELIVERY_REPORT_ENABLED = "enableMMSDeliveryReports";
field public static final java.lang.String BOOL_MMS_MMS_ENABLED = "enabledMMS";
field public static final java.lang.String BOOL_MMS_MMS_READ_REPORT_ENABLED = "enableMMSReadReports";
field public static final java.lang.String BOOL_MMS_MULTIPART_SMS_ENABLED = "enableMultipartSMS";
field public static final java.lang.String BOOL_MMS_NOTIFY_WAP_MMSC_ENABLED = "enabledNotifyWapMMSC";
field public static final java.lang.String BOOL_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES = "sendMultipartSmsAsSeparateMessages";
field public static final java.lang.String BOOL_MMS_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
field public static final java.lang.String BOOL_MMS_SMS_DELIVERY_REPORT_ENABLED = "enableSMSDeliveryReports";
field public static final java.lang.String BOOL_MMS_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
field public static final java.lang.String BOOL_MMS_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
field public static final java.lang.String BOOL_OPERATOR_SELECTION_EXPAND = "bool_operator_selection_expand";
field public static final java.lang.String BOOL_PREFER_2G = "bool_prefer_2g";
field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";
@@ -30661,24 +30647,7 @@ package android.telephony {
field public static final java.lang.String BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT = "bool_voicemail_notification_persistent";
field public static final java.lang.String BOOL_VOICE_PRIVACY_DISABLE = "bool_voice_privacy_disable";
field public static final java.lang.String BOOL_WORLD_PHONE = "bool_world_phone";
field public static final java.lang.String INT_MMS_ALIAS_MAX_CHARS = "aliasMaxChars";
field public static final java.lang.String INT_MMS_ALIAS_MIN_CHARS = "aliasMinChars";
field public static final java.lang.String INT_MMS_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
field public static final java.lang.String INT_MMS_MAX_IMAGE_HEIGHT = "maxImageHeight";
field public static final java.lang.String INT_MMS_MAX_IMAGE_WIDTH = "maxImageWidth";
field public static final java.lang.String INT_MMS_MAX_MESSAGE_SIZE = "maxMessageSize";
field public static final java.lang.String INT_MMS_MESSAGE_TEXT_MAX_SIZE = "maxMessageTextSize";
field public static final java.lang.String INT_MMS_RECIPIENT_LIMIT = "recipientLimit";
field public static final java.lang.String INT_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
field public static final java.lang.String INT_MMS_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
field public static final java.lang.String INT_MMS_SUBJECT_MAX_LENGTH = "maxSubjectLength";
field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";
field public static final java.lang.String STRING_MMS_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
field public static final java.lang.String STRING_MMS_HTTP_PARAMS = "httpParams";
field public static final java.lang.String STRING_MMS_NAI_SUFFIX = "naiSuffix";
field public static final java.lang.String STRING_MMS_UA_PROF_TAG_NAME = "uaProfTagName";
field public static final java.lang.String STRING_MMS_UA_PROF_URL = "uaProfUrl";
field public static final java.lang.String STRING_MMS_USER_AGENT = "userAgent";
}
public final class CellIdentityCdma implements android.os.Parcelable {
@@ -31028,7 +30997,6 @@ package android.telephony {
field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
field public static final java.lang.String MMS_CONFIG_SUBJECT_MAX_LENGTH = "maxSubjectLength";
field public static final java.lang.String MMS_CONFIG_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
field public static final java.lang.String MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
field public static final java.lang.String MMS_CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
field public static final java.lang.String MMS_CONFIG_UA_PROF_URL = "uaProfUrl";

32
api/system-current.txt
View File

@@ -32849,20 +32849,6 @@ package android.telephony {
field public static final java.lang.String BOOL_HAS_IN_CALL_NOISE_SUPPRESSION = "bool_has_in_call_noise_suppression";
field public static final java.lang.String BOOL_HIDE_CARRIER_NETWORK_SETTINGS = "bool_hide_carrier_network_settings";
field public static final java.lang.String BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS = "bool_ignore_sim_network_locked_events";
field public static final java.lang.String BOOL_MMS_ALIAS_ENABLED = "aliasEnabled";
field public static final java.lang.String BOOL_MMS_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
field public static final java.lang.String BOOL_MMS_APPEND_TRANSACTION_ID = "enabledTransID";
field public static final java.lang.String BOOL_MMS_GROUP_MMS_ENABLED = "enableGroupMms";
field public static final java.lang.String BOOL_MMS_MMS_DELIVERY_REPORT_ENABLED = "enableMMSDeliveryReports";
field public static final java.lang.String BOOL_MMS_MMS_ENABLED = "enabledMMS";
field public static final java.lang.String BOOL_MMS_MMS_READ_REPORT_ENABLED = "enableMMSReadReports";
field public static final java.lang.String BOOL_MMS_MULTIPART_SMS_ENABLED = "enableMultipartSMS";
field public static final java.lang.String BOOL_MMS_NOTIFY_WAP_MMSC_ENABLED = "enabledNotifyWapMMSC";
field public static final java.lang.String BOOL_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES = "sendMultipartSmsAsSeparateMessages";
field public static final java.lang.String BOOL_MMS_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
field public static final java.lang.String BOOL_MMS_SMS_DELIVERY_REPORT_ENABLED = "enableSMSDeliveryReports";
field public static final java.lang.String BOOL_MMS_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
field public static final java.lang.String BOOL_MMS_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
field public static final java.lang.String BOOL_OPERATOR_SELECTION_EXPAND = "bool_operator_selection_expand";
field public static final java.lang.String BOOL_PREFER_2G = "bool_prefer_2g";
field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";
@@ -32876,24 +32862,7 @@ package android.telephony {
field public static final java.lang.String BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT = "bool_voicemail_notification_persistent";
field public static final java.lang.String BOOL_VOICE_PRIVACY_DISABLE = "bool_voice_privacy_disable";
field public static final java.lang.String BOOL_WORLD_PHONE = "bool_world_phone";
field public static final java.lang.String INT_MMS_ALIAS_MAX_CHARS = "aliasMaxChars";
field public static final java.lang.String INT_MMS_ALIAS_MIN_CHARS = "aliasMinChars";
field public static final java.lang.String INT_MMS_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
field public static final java.lang.String INT_MMS_MAX_IMAGE_HEIGHT = "maxImageHeight";
field public static final java.lang.String INT_MMS_MAX_IMAGE_WIDTH = "maxImageWidth";
field public static final java.lang.String INT_MMS_MAX_MESSAGE_SIZE = "maxMessageSize";
field public static final java.lang.String INT_MMS_MESSAGE_TEXT_MAX_SIZE = "maxMessageTextSize";
field public static final java.lang.String INT_MMS_RECIPIENT_LIMIT = "recipientLimit";
field public static final java.lang.String INT_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
field public static final java.lang.String INT_MMS_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
field public static final java.lang.String INT_MMS_SUBJECT_MAX_LENGTH = "maxSubjectLength";
field public static final java.lang.String INT_VOLTE_REPLACEMENT_RAT = "int_volte_replacement_rat";
field public static final java.lang.String STRING_MMS_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
field public static final java.lang.String STRING_MMS_HTTP_PARAMS = "httpParams";
field public static final java.lang.String STRING_MMS_NAI_SUFFIX = "naiSuffix";
field public static final java.lang.String STRING_MMS_UA_PROF_TAG_NAME = "uaProfTagName";
field public static final java.lang.String STRING_MMS_UA_PROF_URL = "uaProfUrl";
field public static final java.lang.String STRING_MMS_USER_AGENT = "userAgent";
}
public final class CellIdentityCdma implements android.os.Parcelable {
@@ -33243,7 +33212,6 @@ package android.telephony {
field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
field public static final java.lang.String MMS_CONFIG_SUBJECT_MAX_LENGTH = "maxSubjectLength";
field public static final java.lang.String MMS_CONFIG_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
field public static final java.lang.String MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
field public static final java.lang.String MMS_CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
field public static final java.lang.String MMS_CONFIG_UA_PROF_URL = "uaProfUrl";

69
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -37,8 +37,6 @@ import android.os.ServiceManager;
* @see Context#CARRIER_CONFIG_SERVICE
*/
public class CarrierConfigManager {
private final static String TAG = "CarrierConfigManager";
/**
* @hide
*/
@@ -225,39 +223,7 @@ public class CarrierConfigManager {
*/
public static final String STRING_VVM_TYPE = "string_vvm_type";
// These variables are used by the MMS service and exposed through another API, {@link
// SmsManager}. The variable names and string values are copied from there.
public static final String BOOL_MMS_ALIAS_ENABLED = "aliasEnabled";
public static final String BOOL_MMS_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
public static final String BOOL_MMS_APPEND_TRANSACTION_ID = "enabledTransID";
public static final String BOOL_MMS_GROUP_MMS_ENABLED = "enableGroupMms";
public static final String BOOL_MMS_MMS_DELIVERY_REPORT_ENABLED = "enableMMSDeliveryReports";
public static final String BOOL_MMS_MMS_ENABLED = "enabledMMS";
public static final String BOOL_MMS_MMS_READ_REPORT_ENABLED = "enableMMSReadReports";
public static final String BOOL_MMS_MULTIPART_SMS_ENABLED = "enableMultipartSMS";
public static final String BOOL_MMS_NOTIFY_WAP_MMSC_ENABLED = "enabledNotifyWapMMSC";
public static final String BOOL_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES = "sendMultipartSmsAsSeparateMessages";
public static final String BOOL_MMS_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
public static final String BOOL_MMS_SMS_DELIVERY_REPORT_ENABLED = "enableSMSDeliveryReports";
public static final String BOOL_MMS_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
public static final String BOOL_MMS_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
public static final String INT_MMS_ALIAS_MAX_CHARS = "aliasMaxChars";
public static final String INT_MMS_ALIAS_MIN_CHARS = "aliasMinChars";
public static final String INT_MMS_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
public static final String INT_MMS_MAX_IMAGE_HEIGHT = "maxImageHeight";
public static final String INT_MMS_MAX_IMAGE_WIDTH = "maxImageWidth";
public static final String INT_MMS_MAX_MESSAGE_SIZE = "maxMessageSize";
public static final String INT_MMS_MESSAGE_TEXT_MAX_SIZE = "maxMessageTextSize";
public static final String INT_MMS_RECIPIENT_LIMIT = "recipientLimit";
public static final String INT_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
public static final String INT_MMS_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
public static final String INT_MMS_SUBJECT_MAX_LENGTH = "maxSubjectLength";
public static final String STRING_MMS_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
public static final String STRING_MMS_HTTP_PARAMS = "httpParams";
public static final String STRING_MMS_NAI_SUFFIX = "naiSuffix";
public static final String STRING_MMS_UA_PROF_TAG_NAME = "uaProfTagName";
public static final String STRING_MMS_UA_PROF_URL = "uaProfUrl";
public static final String STRING_MMS_USER_AGENT = "userAgent";
private final static String TAG = "CarrierConfigManager";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -296,39 +262,6 @@ public class CarrierConfigManager {
sDefaults.putInt(INT_VVM_PORT_NUMBER, 0);
sDefaults.putString(STRING_VVM_DESTINATION_NUMBER, "");
sDefaults.putString(STRING_VVM_TYPE, "");
// MMS defaults
sDefaults.putBoolean(BOOL_MMS_ALIAS_ENABLED, false);
sDefaults.putBoolean(BOOL_MMS_ALLOW_ATTACH_AUDIO, true);
sDefaults.putBoolean(BOOL_MMS_APPEND_TRANSACTION_ID, false);
sDefaults.putBoolean(BOOL_MMS_GROUP_MMS_ENABLED, true);
sDefaults.putBoolean(BOOL_MMS_MMS_DELIVERY_REPORT_ENABLED, false);
sDefaults.putBoolean(BOOL_MMS_MMS_ENABLED, true);
sDefaults.putBoolean(BOOL_MMS_MMS_READ_REPORT_ENABLED, false);
sDefaults.putBoolean(BOOL_MMS_MULTIPART_SMS_ENABLED, true);
sDefaults.putBoolean(BOOL_MMS_NOTIFY_WAP_MMSC_ENABLED, false);
sDefaults.putBoolean(BOOL_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES, false);
sDefaults.putBoolean(BOOL_MMS_SHOW_CELL_BROADCAST_APP_LINKS, true);
sDefaults.putBoolean(BOOL_MMS_SMS_DELIVERY_REPORT_ENABLED, true);
sDefaults.putBoolean(BOOL_MMS_SUPPORT_HTTP_CHARSET_HEADER, false);
sDefaults.putBoolean(BOOL_MMS_SUPPORT_MMS_CONTENT_DISPOSITION, true);
sDefaults.putInt(INT_MMS_ALIAS_MAX_CHARS, 48);
sDefaults.putInt(INT_MMS_ALIAS_MIN_CHARS, 2);
sDefaults.putInt(INT_MMS_HTTP_SOCKET_TIMEOUT, 60 * 1000);
sDefaults.putInt(INT_MMS_MAX_IMAGE_HEIGHT, 480);
sDefaults.putInt(INT_MMS_MAX_IMAGE_WIDTH, 640);
sDefaults.putInt(INT_MMS_MAX_MESSAGE_SIZE, 300 * 1024);
sDefaults.putInt(INT_MMS_MESSAGE_TEXT_MAX_SIZE, -1);
sDefaults.putInt(INT_MMS_RECIPIENT_LIMIT, Integer.MAX_VALUE);
sDefaults.putInt(INT_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD, -1);
sDefaults.putInt(INT_MMS_SMS_TO_MMS_TEXT_THRESHOLD, -1);
sDefaults.putInt(INT_MMS_SUBJECT_MAX_LENGTH, 40);
sDefaults.putString(STRING_MMS_EMAIL_GATEWAY_NUMBER, "");
sDefaults.putString(STRING_MMS_HTTP_PARAMS, "");
sDefaults.putString(STRING_MMS_NAI_SUFFIX, "");
sDefaults.putString(STRING_MMS_UA_PROF_TAG_NAME, "x-wap-profile");
sDefaults.putString(STRING_MMS_UA_PROF_URL, "");
sDefaults.putString(STRING_MMS_USER_AGENT, "");
}
/**