From 49b204264ed20988b1424e6c9a99e7f082e51039 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Wed, 1 Jun 2016 12:17:23 -0700 Subject: [PATCH] Add carrier config variables for overriding carrier name from carrierconf. Bug: 27718118 Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658 --- .../android/telephony/CarrierConfigManager.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 613fae4916b60..5c2e0baab768e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -581,6 +581,20 @@ public class CarrierConfigManager { /** @hide */ public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int"; + /** + * Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app. + * @hide + */ + public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; + + /** + * String to identify carrier name in CarrierConfig app. This string is used only if + * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true + * @hide + */ + public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; + + /** * If this is true, the SIM card (through Customer Service Profile EF file) will be able to * prevent manual operator selection. If false, this SIM setting will be ignored and manual @@ -785,6 +799,8 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0); sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0); sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false); + sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false); + sDefaults.putString(KEY_CARRIER_NAME_STRING, ""); // MMS defaults sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);