commit f180dc7fb6da1600d3698b262d8b826e2b7e9ac8
author Jonathan Basseri <misterikkit@google.com> Fri Jun 19 13:47:51 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Fri Jun 19 14:24:58 2015 -0700
tree 675d40582ed282f5710bd1ef8135b9d96f6b2621
parent 14c8c213438736b4955fc74f9f5646c4ad4c38a0

Migrate 'csp_enabled' to CarrierConfigManager.

This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in *DEVICE* overlays for specific
networks, but we are dropping the device-overlay so that this simply
applies to those same networks.

Change-Id: I9ab91f79b55a88e725d789a942265da1afc3b979

src/com/android/phone/GsmUmtsOptions.java

diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index df5f2cd..d12bac9 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -85,7 +85,7 @@
                         .findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY));
             }
 
-            if (res.getBoolean(R.bool.csp_enabled)) {
+            if (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)) {
                 if (PhoneFactory.getDefaultPhone().isCspPlmnEnabled()) {
                     log("[CSP] Enabling Operator Selection menu.");
                     mButtonOperatorSelectionExpand.setEnabled(true);