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

Commit 7f9b5681 authored by Russell Brenner's avatar Russell Brenner Committed by Android Git Automerger
Browse files

am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev 

* commit '553074f0':
  Return RESULT_OK when wifi connection established
parents fee5c228 553074f0

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

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ public class WifiSettings extends SettingsPreferenceFragment 
                    activity.getSystemService(Context.CONNECTIVITY_SERVICE);

            if (connectivity != null

                    && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {

                activity.setResult(Activity.RESULT_OK);

                activity.finish();

                return;

            }
@@ -837,6 +838,7 @@ public class WifiSettings extends SettingsPreferenceFragment 
            if (mAutoFinishOnConnection && info.isConnected()) {

                Activity activity = getActivity();

                if (activity != null) {

                    activity.setResult(Activity.RESULT_OK);

                    activity.finish();

                }

                return;