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

am 2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev

Browse Source 
* commit '2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
  Move super call to top of onActivityCreated
This commit is contained in:
Russell Brenner
2012-09-27 15:16:56 -07:00
committed by Android Git Automerger
parent 6956e4b007 2c84b9f23c
commit 6cd719c9e8
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,9 +236,8 @@ public class WifiSettings extends SettingsPreferenceFragment
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
// We don't call super.onActivityCreated() here, since it assumes we already set up super.onActivityCreated(savedInstanceState);
// Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
// 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);
@@ -294,7 +293,6 @@ 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;
} }
@@ -356,9 +354,6 @@ public class WifiSettings extends SettingsPreferenceFragment
registerForContextMenu(getListView()); registerForContextMenu(getListView());
} }
setHasOptionsMenu(true); setHasOptionsMenu(true);
// After confirming PreferenceScreen is available, we call super.
super.onActivityCreated(savedInstanceState);
} }
@Override @Override