PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Fix NPE in ConfigureWifiSettings.

Browse Source 
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.

Bug: 34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
This commit is contained in:
pkanwar
2017-01-09 12:21:22 -08:00
parent cd3475f3d1
commit ef2b35ad59
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -101,6 +101,13 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
if (!mWifiManager.hasCarrierConfiguredNetworks()){ if (!mWifiManager.hasCarrierConfiguredNetworks()){
removePreference(KEY_CONNECT_CARRIER_NETWORKS); removePreference(KEY_CONNECT_CARRIER_NETWORKS);
} else {
SwitchPreference connectToCarrierNetworks =
(SwitchPreference) findPreference(KEY_CONNECT_CARRIER_NETWORKS);
if (connectToCarrierNetworks != null) {
connectToCarrierNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS, 0) == 1);
}
} }
SwitchPreference notifyOpenNetworks = SwitchPreference notifyOpenNetworks =
@@ -109,11 +116,6 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1); Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled()); notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
SwitchPreference connectToCarrierNetworks =
(SwitchPreference) findPreference(KEY_CONNECT_CARRIER_NETWORKS);
connectToCarrierNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS, 0) == 1);
final Context context = getActivity(); final Context context = getActivity();
if (avoidBadWifiConfig()) { if (avoidBadWifiConfig()) {
// Hide preference toggle, always avoid bad wifi networks. // Hide preference toggle, always avoid bad wifi networks.