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

Merge "Don't crash during setup of secondary users" into jb-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-09-12 15:41:41 -07:00
committed by Android (Google) Code Review
parent 43db5267d6 df5a62e30b
commit 2001a179cc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -239,7 +239,6 @@ public class WifiSettings extends SettingsPreferenceFragment
// We don't call super.onActivityCreated() here, since it assumes we already set up // We don't call super.onActivityCreated() here, since it assumes we already set up
// Preference (probably in onCreate()), while WifiSettings exceptionally set it up in // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
// this method. // this method.
mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
@@ -295,6 +294,7 @@ public class WifiSettings extends SettingsPreferenceFragment
getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity != null if (connectivity != null
&& connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
super.onActivityCreated(savedInstanceState);
activity.finish(); activity.finish();
return; return;
} }