Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2001a179 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

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

parents 43db5267 df5a62e3

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

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ public class WifiSettings extends SettingsPreferenceFragment 
        // 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 @@ 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;

            }