diff options
| author | Scott Warner <Tortel1210@gmail.com> | 2013-01-06 23:22:12 -0500 |
|---|---|---|
| committer | Scott Warner <Tortel1210@gmail.com> | 2013-01-07 16:30:09 -0500 |
| commit | 0ed0f22dfda6edcbc9b6d89caf86f6bc8cdfea3b (patch) | |
| tree | e13701def0152c91b10763a10e44235a056eddbd | |
| parent | c5f6af5f3bd0b062f773cf500c344dfa0fdbda00 (diff) | |
| download | packages_apps_settings-0ed0f22dfda6edcbc9b6d89caf86f6bc8cdfea3b.zip packages_apps_settings-0ed0f22dfda6edcbc9b6d89caf86f6bc8cdfea3b.tar.gz packages_apps_settings-0ed0f22dfda6edcbc9b6d89caf86f6bc8cdfea3b.tar.bz2 | |
Fix NPE exceptions in the Quick Settings menu
Double check that the settings were not previously removed and are
now null.
Change-Id: I3971f818ebbb5630caf348e38bfe1b2721f8ff48
| -rw-r--r-- | src/com/android/settings/cyanogenmod/QuickSettings.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/settings/cyanogenmod/QuickSettings.java b/src/com/android/settings/cyanogenmod/QuickSettings.java index 9ceb47a..e9dc877 100644 --- a/src/com/android/settings/cyanogenmod/QuickSettings.java +++ b/src/com/android/settings/cyanogenmod/QuickSettings.java @@ -90,7 +90,8 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe mStaticTiles = (PreferenceCategory) prefSet.findPreference(STATIC_TILES); mQuickPulldown = (ListPreference) prefSet.findPreference(QUICK_PULLDOWN); if (!Utils.isPhone(getActivity())) { - mGeneralSettings.removePreference(mQuickPulldown); + if(mQuickPulldown != null) + mGeneralSettings.removePreference(mQuickPulldown); } else { mQuickPulldown.setOnPreferenceChangeListener(this); int quickPulldownValue = Settings.System.getInt(resolver, Settings.System.QS_QUICK_PULLDOWN, 0); @@ -114,8 +115,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe // Add the network mode preference mNetworkMode = (ListPreference) prefSet.findPreference(EXP_NETWORK_MODE); - mNetworkMode.setSummary(mNetworkMode.getEntry()); - mNetworkMode.setOnPreferenceChangeListener(this); + if(mNetworkMode != null){ + mNetworkMode.setSummary(mNetworkMode.getEntry()); + mNetworkMode.setOnPreferenceChangeListener(this); + } // Screen timeout mode mScreenTimeoutMode = (ListPreference) prefSet.findPreference(EXP_SCREENTIMEOUT_MODE); @@ -138,7 +141,8 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe QuickSettingsUtil.TILES.remove(QuickSettingsUtil.TILE_MOBILEDATA); QuickSettingsUtil.TILES.remove(QuickSettingsUtil.TILE_WIFIAP); QuickSettingsUtil.TILES.remove(QuickSettingsUtil.TILE_NETWORKMODE); - mStaticTiles.removePreference(mNetworkMode); + if(mNetworkMode != null) + mStaticTiles.removePreference(mNetworkMode); } else { // We have telephony support however, some phones run on networks not supported // by the networkmode tile so remove both it and the associated options list |