commit 91007154982fd40f464f3d58ddb20d565b505e53
author Sandeep Gutta <sangutta@codeaurora.org> Tue Jul 01 12:05:52 2014 +0530
committer Stuart Scott <stuartscott@google.com> Thu Jul 17 14:01:29 2014 -0700
tree 60b7ff60235abeec5b7081f6bed48e0d0d61d85f
parent 92e837e1f6f36cca2e716e0e8c5b9b6d06c417d6

Fix Carrier settings crash issue

When world_phone enabled, "carrier settings" option
present in Mobile Network Settings menu and if we
select on it there is a crash in PhoneApp.

To fix it, modify "enabled_networks_key" handling properly
to do not display "carrier settings" menu option when
config config_carrier_settings_enable is set to false

Change-Id: Ie5fc1f60872cbed7ad82098df01720b77d88b453

src/com/android/phone/GsmUmtsOptions.java

diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 6829dec..6791f27 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -36,6 +36,7 @@
 
     private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key";
     private static final String BUTTON_OPERATOR_SELECTION_EXPAND_KEY = "button_carrier_sel_key";
+    private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
     private PreferenceActivity mPrefActivity;
     private PreferenceScreen mPrefScreen;
 
@@ -80,6 +81,16 @@
                           .findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY));
                 }
             }
+
+            // Read platform settings for carrier settings
+            final boolean isCarrierSettingsEnabled = mPrefActivity.getResources().getBoolean(
+                    R.bool.config_carrier_settings_enable);
+            if (!isCarrierSettingsEnabled) {
+                Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
+                if (pref != null) {
+                    mPrefScreen.removePreference(pref);
+                }
+            }
         }
     }