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

Merge "DO NOT MERGE Add CarrierConfig to overlay incorrect country ISO" into pi-dev

Browse Source
This commit is contained in:
Allen Su
2019-02-10 10:29:35 +00:00
committed by Android (Google) Code Review
parent 4dbab056a2 f636191bea
commit e4a6fc375c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1091,6 +1091,19 @@ public class CarrierConfigManager {
*/
public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
/**
* String to override sim country iso.
* Sim country iso is based on sim MCC which is coarse and doesn't work with dual IMSI SIM where
* a SIM can have multiple MCC from different countries.
* Instead, each sim carrier should have a single country code, apply per carrier based iso
* code as an override. The overridden value can be read from
* {@link TelephonyManager#getSimCountryIso()} and {@link SubscriptionInfo#getCountryIso()}
*
* @hide
*/
public static final String KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING =
"sim_country_iso_override_string";
/**
* Override the registered PLMN name using #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING.
*
@@ -2237,6 +2250,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putString(KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING, "");
sDefaults.putBoolean(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);

11
telephony/java/android/telephony/SmsManager.java
View File

@@ -257,6 +257,15 @@ public final class SmsManager {
*/
public static final String MMS_CONFIG_SUPPORT_HTTP_CHARSET_HEADER =
CarrierConfigManager.KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL;
/**
* When roaming, some operator's MCC would change. It results in MMSService's verification
* failure. This config could use correct country.
* @hide
*/
public static final String MMS_CONFIG_SIM_COUNTRY_ISO_OVERRIDE =
CarrierConfigManager.KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING;
/**
* If true, add "Connection: close" header to MMS HTTP requests so the connection
* is immediately closed (disabling keep-alive). (Boolean type)
@@ -2065,6 +2074,8 @@ public final class SmsManager {
filtered.putString(MMS_CONFIG_EMAIL_GATEWAY_NUMBER,
config.getString(MMS_CONFIG_EMAIL_GATEWAY_NUMBER));
filtered.putString(MMS_CONFIG_NAI_SUFFIX, config.getString(MMS_CONFIG_NAI_SUFFIX));
filtered.putString(MMS_CONFIG_SIM_COUNTRY_ISO_OVERRIDE,
config.getString(MMS_CONFIG_SIM_COUNTRY_ISO_OVERRIDE));
filtered.putBoolean(MMS_CONFIG_SHOW_CELL_BROADCAST_APP_LINKS,
config.getBoolean(MMS_CONFIG_SHOW_CELL_BROADCAST_APP_LINKS));
filtered.putBoolean(MMS_CONFIG_SUPPORT_HTTP_CHARSET_HEADER,