Renaming carrier config variable keys.
API council advised us to use KEY_NAME_TYPE for our key constants.
Bug: 21571894
Change-Id: Ib5d5aff1c9070d9e5913a4099fcf55c67b800150
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 3178ae4..0578e0c 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -215,7 +215,7 @@
PersistableBundle carrierConfig =
PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
- if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_AUTO_RETRY_ENABLED)) {
+ if (carrierConfig.getBoolean(CarrierConfigManager.KEY_AUTO_RETRY_ENABLED_BOOL)) {
mButtonAutoRetry.setOnPreferenceChangeListener(this);
int autoretry = Settings.Global.getInt(
getContentResolver(), Settings.Global.CALL_AUTO_RETRY, 0);
@@ -227,7 +227,7 @@
Preference cdmaOptions = prefSet.findPreference(BUTTON_CDMA_OPTIONS);
Preference gsmOptions = prefSet.findPreference(BUTTON_GSM_UMTS_OPTIONS);
- if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE)) {
+ if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
cdmaOptions.setIntent(mSubscriptionInfoHelper.getIntent(CdmaCallOptions.class));
gsmOptions.setIntent(mSubscriptionInfoHelper.getIntent(GsmUmtsCallOptions.class));
} else {
@@ -244,13 +244,15 @@
if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
prefSet.removePreference(fdnButton);
- if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_VOICE_PRIVACY_DISABLE)) {
+ if (!carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
addPreferencesFromResource(R.xml.cdma_call_privacy);
}
} else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
fdnButton.setIntent(mSubscriptionInfoHelper.getIntent(FdnSetting.class));
- if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_ADDITIONAL_CALL_SETTING)) {
+ if (carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_ADDITIONAL_CALL_SETTING_BOOL)) {
addPreferencesFromResource(R.xml.gsm_umts_call_options);
GsmUmtsCallOptions.init(prefSet, mSubscriptionInfoHelper);
}
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 7d8c991..9131ad6 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -59,7 +59,7 @@
carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
}
if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
- || carrierConfig.getBoolean(CarrierConfigManager.BOOL_VOICE_PRIVACY_DISABLE)) {
+ || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
// disable the entire screen
getPreferenceScreen().setEnabled(false);
}
diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 76753fc..eabbdd2 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -66,9 +66,11 @@
mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
boolean removedAPNExpand = false;
- PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ PersistableBundle carrierConfig =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
// Some CDMA carriers want the APN settings.
- if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA) && mButtonAPNExpand != null) {
+ if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL)
+ && mButtonAPNExpand != null) {
mPrefScreen.removePreference(mButtonAPNExpand);
removedAPNExpand = true;
}
@@ -118,7 +120,7 @@
// Read platform settings for carrier settings
final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
- CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE);
+ CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
if (!isCarrierSettingsEnabled) {
Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
if (pref != null) {
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 2e444e0..71557c6 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -201,7 +201,7 @@
// Check whether we should show the onscreen "Dial" button and co.
PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
- if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_ONSCREEN_DIAL_BUTTON)) {
+ if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
mDialButton.setOnClickListener(this);
} else {
mDialButton.setVisibility(View.GONE);
@@ -239,7 +239,10 @@
registerReceiver(mBroadcastReceiver, intentFilter);
try {
- mHaptic.init(this, carrierConfig.getBoolean(CarrierConfigManager.BOOL_ENABLE_DIALER_KEY_VIBRATION));
+ mHaptic.init(
+ this,
+ carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL));
} catch (Resources.NotFoundException nfe) {
Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
}
diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 24dfb74..df5f2cd 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -66,18 +66,21 @@
} else {
log("Not a CDMA phone");
Resources res = mPrefActivity.getResources();
- PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(mSubId);
+ PersistableBundle carrierConfig =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mSubId);
// Determine which options to display. For GSM these are defaulted to true in
// CarrierConfigManager, but they maybe overriden by DefaultCarrierConfigService or a
// carrier app.
// Note: these settings used to be controlled with overlays in
// Telephony/res/values/config.xml
- if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_APN_EXPAND) && mButtonAPNExpand != null) {
+ if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL)
+ && mButtonAPNExpand != null) {
mPrefScreen.removePreference(mButtonAPNExpand);
removedAPNExpand = true;
}
- if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND)) {
+ if (!carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)) {
mPrefScreen.removePreference(mPrefScreen
.findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY));
}
@@ -95,7 +98,7 @@
// Read platform settings for carrier settings
final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
- CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE);
+ CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
if (!isCarrierSettingsEnabled) {
Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
if (pref != null) {
diff --git a/src/com/android/phone/IccNetworkDepersonalizationPanel.java b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
index b241c3c..34153c8 100644
--- a/src/com/android/phone/IccNetworkDepersonalizationPanel.java
+++ b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
@@ -138,7 +138,8 @@
// based on the "sim_network_unlock_allow_dismiss" resource.
mDismissButton = (Button) findViewById(R.id.ndp_dismiss);
PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
- if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS)) {
+ if (carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL)) {
if (DBG) log("Enabling 'Dismiss' button...");
mDismissButton.setVisibility(View.VISIBLE);
mDismissButton.setOnClickListener(mDismissListener);
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 64d2aa6..b3df183 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -74,7 +74,8 @@
if (intent.getAction().equals(OtaUtils.ACTION_PERFORM_CDMA_PROVISIONING)) {
PersistableBundle carrierConfig = app.getCarrierConfig();
- boolean usesHfa = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_HFA_FOR_PROVISIONING);
+ boolean usesHfa = carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_USE_HFA_FOR_PROVISIONING_BOOL);
if (usesHfa) {
Log.i(LOG_TAG, "Starting Hfa from ACTION_PERFORM_CDMA_PROVISIONING");
startHfa();
@@ -82,7 +83,8 @@
return;
}
- boolean usesOtasp = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING);
+ boolean usesOtasp = carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_USE_OTASP_FOR_PROVISIONING_BOOL);
if (usesOtasp) {
// On voice-capable devices, we perform CDMA provisioning in
// "interactive" mode by directly launching the InCallScreen.
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index df94023..8106ab6 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -540,7 +540,7 @@
PersistableBundle carrierConfig =
PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
mIsGlobalCdma = isLteOnCdma
- && carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES);
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
int shouldHideCarrierSettings = android.provider.Settings.Global.getInt(
mPhone.getContext().getContentResolver(),
android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0);
@@ -548,7 +548,7 @@
prefSet.removePreference(mButtonPreferredNetworkMode);
prefSet.removePreference(mButtonEnabledNetworks);
prefSet.removePreference(mLteDataServicePref);
- } else if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE) == true) {
+ } else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL) == true) {
prefSet.removePreference(mButtonEnabledNetworks);
// set the listener for the mButtonPreferredNetworkMode list preference so we can issue
// change Preferred Network Mode.
@@ -606,13 +606,13 @@
mGsmUmtsOptions = null;
}
} else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
- if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_PREFER_2G)
+ if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)
&& !getResources().getBoolean(R.bool.config_enabled_lte)) {
mButtonEnabledNetworks.setEntries(
R.array.enabled_networks_except_gsm_lte_choices);
mButtonEnabledNetworks.setEntryValues(
R.array.enabled_networks_except_gsm_lte_values);
- } else if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_PREFER_2G)) {
+ } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)) {
int select = (mShow4GForLTE == true) ?
R.array.enabled_networks_except_gsm_4g_choices
: R.array.enabled_networks_except_gsm_choices;
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index c5a9f12..885b797 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -409,7 +409,7 @@
.setSound(ringtoneUri)
.setColor(res.getColor(R.color.dialer_theme_color))
.setOngoing(carrierConfig.getBoolean(
- CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT));
+ CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL));
if (VoicemailNotificationSettingsUtil.isVibrationEnabled(phone)) {
builder.setDefaults(Notification.DEFAULT_VIBRATE);
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index d066de2..eb9ea15 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -240,7 +240,8 @@
// TODO: This event should be handled by the lock screen, just
// like the "SIM missing" and "Sim locked" cases (bug 1804111).
case EVENT_SIM_NETWORK_LOCKED:
- if (getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS)) {
+ if (getCarrierConfig().getBoolean(
+ CarrierConfigManager.KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL)) {
// Some products don't have the concept of a "SIM network lock"
Log.i(LOG_TAG, "Ignoring EVENT_SIM_NETWORK_LOCKED event; "
+ "not showing 'SIM network unlock' PIN entry screen");
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 41699cc..13ca3e3 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2298,12 +2298,12 @@
@Override
public boolean canChangeDtmfToneLength() {
- return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED);
+ return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL);
}
@Override
public boolean isWorldPhone() {
- return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE);
+ return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL);
}
@Override
diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
index 6300622..9f39db1 100644
--- a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
@@ -53,7 +53,7 @@
}
return mCarrierConfig.getString(
- CarrierConfigManager.STRING_VVM_TYPE, null);
+ CarrierConfigManager.KEY_VVM_TYPE_STRING, null);
}
public String getCarrierVvmPackageName() {
@@ -62,7 +62,7 @@
}
return mCarrierConfig.getString(
- CarrierConfigManager.STRING_CARRIER_VVM_PACKAGE_NAME, null);
+ CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING, null);
}
public boolean isOmtpVvmType() {
@@ -76,7 +76,7 @@
*/
public boolean isEnabledByDefault() {
String packageName = mCarrierConfig.getString(
- CarrierConfigManager.STRING_CARRIER_VVM_PACKAGE_NAME);
+ CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING);
if (packageName == null) {
return true;
}
@@ -127,9 +127,9 @@
}
int applicationPort = mCarrierConfig.getInt(
- CarrierConfigManager.INT_VVM_PORT_NUMBER, 0);
+ CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 0);
String destinationNumber = mCarrierConfig.getString(
- CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER);
+ CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING);
if (TextUtils.isEmpty(destinationNumber)) {
Log.w(TAG, "No destination number for this carrier.");
return null;
diff --git a/src/com/android/services/telephony/CdmaConference.java b/src/com/android/services/telephony/CdmaConference.java
index 36eacea..5926a9f 100755
--- a/src/com/android/services/telephony/CdmaConference.java
+++ b/src/com/android/services/telephony/CdmaConference.java
@@ -171,7 +171,8 @@
Context.CARRIER_CONFIG_SERVICE);
PersistableBundle b = configManager.getConfig();
if (b != null) {
- supportSwapAfterMerge = b.getBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE);
+ supportSwapAfterMerge =
+ b.getBoolean(CarrierConfigManager.KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL);
Log.d(this, "Current network support swap after call merged capability is "
+ supportSwapAfterMerge);
}