From 15a6869fce8d9ebd20150300766ad35e866147a5 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Sat, 19 Jan 2013 21:50:06 +0900 Subject: [PATCH] Fix for F/C in WifiConfigInfo 1. Turn off Wi-Fi 2. Open the dialer and input *#*#4636#*#* 3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately, Settings has stopped" dialog. Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198 Signed-off-by: Shuhrat Dehkanov --- .../android/settings/wifi/WifiConfigInfo.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigInfo.java b/src/com/android/settings/wifi/WifiConfigInfo.java index 2ed4f028038..9b680a85bb1 100644 --- a/src/com/android/settings/wifi/WifiConfigInfo.java +++ b/src/com/android/settings/wifi/WifiConfigInfo.java @@ -31,15 +31,9 @@ import com.android.settings.R; */ public class WifiConfigInfo extends Activity { - private static final String TAG = "WifiConfigInfo"; - private TextView mConfigList; private WifiManager mWifiManager; - //============================ - // Activity lifecycle - //============================ - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -52,12 +46,16 @@ public class WifiConfigInfo extends Activity { @Override protected void onResume() { super.onResume(); - final List wifiConfigs = mWifiManager.getConfiguredNetworks(); - StringBuffer configList = new StringBuffer(); - for (int i = wifiConfigs.size() - 1; i >= 0; i--) { - configList.append(wifiConfigs.get(i)); + if (mWifiManager.isWifiEnabled()) { + final List wifiConfigs = mWifiManager.getConfiguredNetworks(); + StringBuffer configList = new StringBuffer(); + for (int i = wifiConfigs.size() - 1; i >= 0; i--) { + configList.append(wifiConfigs.get(i)); + } + mConfigList.setText(configList); + } else { + mConfigList.setText(R.string.wifi_state_disabled); } - mConfigList.setText(configList); } }