commit 2001a179cc0a0c42bd9fae21e51793c16f09d0ae
author Christopher Tate <ctate@google.com> Wed Sep 12 15:41:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 12 15:54:29 2012 -0700
tree 6878b4518767d0bdd3e9a5841800d87f5e459369
parent 43db5267d6227cc008fc482ccd777e27ff292c42
parent df5a62e30be409d2b80c896fa333d155a9198522

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

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index a4ee589..b28aef3 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -239,7 +239,6 @@
         // 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.
-
         mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
 
@@ -295,6 +294,7 @@
                     getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivity != null
                     && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+                super.onActivityCreated(savedInstanceState);
                 activity.finish();
                 return;
             }