diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-09-20 13:57:23 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2012-09-20 14:07:41 -0700 |
| commit | 852cfa9335d8abbc164ae6a3b6b25e7da7e9a0fd (patch) | |
| tree | 36e6391fde24a7857cd0f15f2c6a1dfd53eef1f9 /src/com/android/settings/wifi | |
| parent | 9fc59c99efc9413546aa4a60a740f617730a08b0 (diff) | |
| download | packages_apps_Settings-852cfa9335d8abbc164ae6a3b6b25e7da7e9a0fd.zip packages_apps_Settings-852cfa9335d8abbc164ae6a3b6b25e7da7e9a0fd.tar.gz packages_apps_Settings-852cfa9335d8abbc164ae6a3b6b25e7da7e9a0fd.tar.bz2 | |
Move super call to top of onActivityCreated
The historical reasons for not calling super.onActivityCreated early
on appear to be no longer relevant.
Bug: 6935999
Change-Id: I63aad8a4c70ce938ecb07541267cad44e3e18e13
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 b28aef3..8f375bf 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 |