diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-09-27 15:14:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-27 15:14:27 -0700 |
| commit | 2c84b9f23c1bf345478bce7a2955ac309e32fe6d (patch) | |
| tree | 5219edfccfad637ac63acb0e57209fdc217f1e7e /src/com/android/settings/wifi | |
| parent | f4b6a68215a0269837b73f134ff57cf150bc1d9c (diff) | |
| parent | 852cfa9335d8abbc164ae6a3b6b25e7da7e9a0fd (diff) | |
| download | packages_apps_Settings-2c84b9f23c1bf345478bce7a2955ac309e32fe6d.tar.gz packages_apps_Settings-2c84b9f23c1bf345478bce7a2955ac309e32fe6d.tar.bz2 packages_apps_Settings-2c84b9f23c1bf345478bce7a2955ac309e32fe6d.zip | |
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index b28aef334..8f375bf69 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -236,9 +236,8 @@ public class WifiSettings extends SettingsPreferenceFragment @Override public void onActivityCreated(Bundle savedInstanceState) { - // 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 - // this method. + super.onActivityCreated(savedInstanceState); + mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); @@ -294,7 +293,6 @@ public class WifiSettings extends SettingsPreferenceFragment getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); if (connectivity != null && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { - super.onActivityCreated(savedInstanceState); activity.finish(); return; } @@ -356,9 +354,6 @@ public class WifiSettings extends SettingsPreferenceFragment registerForContextMenu(getListView()); } setHasOptionsMenu(true); - - // After confirming PreferenceScreen is available, we call super. - super.onActivityCreated(savedInstanceState); } @Override |