Merge "Fix for F/C in WifiConfigInfo"

This commit is contained in:
Irfan Sheriff
2013-01-22 22:58:19 +00:00
committed by Gerrit Code Review

View File

@@ -31,15 +31,9 @@ import com.android.settings.R;
*/ */
public class WifiConfigInfo extends Activity { public class WifiConfigInfo extends Activity {
private static final String TAG = "WifiConfigInfo";
private TextView mConfigList; private TextView mConfigList;
private WifiManager mWifiManager; private WifiManager mWifiManager;
//============================
// Activity lifecycle
//============================
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -52,12 +46,16 @@ public class WifiConfigInfo extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (mWifiManager.isWifiEnabled()) {
final List<WifiConfiguration> wifiConfigs = mWifiManager.getConfiguredNetworks(); final List<WifiConfiguration> wifiConfigs = mWifiManager.getConfiguredNetworks();
StringBuffer configList = new StringBuffer(); StringBuffer configList = new StringBuffer();
for (int i = wifiConfigs.size() - 1; i >= 0; i--) { for (int i = wifiConfigs.size() - 1; i >= 0; i--) {
configList.append(wifiConfigs.get(i)); configList.append(wifiConfigs.get(i));
} }
mConfigList.setText(configList); mConfigList.setText(configList);
} else {
mConfigList.setText(R.string.wifi_state_disabled);
}
} }
} }