Update PhoneGlobals, PhoneInterfaceManager and CdmaConference to use carrierconfig.
Moved variables:
support_swap_after_merge
ignore_sim_network_locked_events
dtmf_type_enabled
world_phone
Bug: b/20270007
Change-Id: I12619f16b6a085b57edc1248b8445705bf5b11de
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index b931340..e71d1fb 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -48,6 +48,7 @@
import android.os.UserHandle;
import android.preference.PreferenceManager;
import android.provider.Settings.System;
+import android.telephony.CarrierConfigManager;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -238,7 +239,7 @@
// 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 (getResources().getBoolean(R.bool.ignore_sim_network_locked_events)) {
+ if (getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS)) {
// 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");