commit 553074f0fc2aa46f44797b72f1457146697645b6
author Russell Brenner <russellbrenner@google.com> Wed Oct 10 10:31:58 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 10:31:59 2012 -0700
tree e7813c630694d58fb91531931e40e8e020e4fc37
parent 7f2824b924775e78192fb12c342b38558cf304b5
parent 3067fbce2ebd74432cba03313a15fd4ead56265d

Merge "Return RESULT_OK when wifi connection established" 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 61093e6..9c3f07f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -332,6 +332,7 @@
                     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 @@
             if (mAutoFinishOnConnection && info.isConnected()) {
                 Activity activity = getActivity();
                 if (activity != null) {
+                    activity.setResult(Activity.RESULT_OK);
                     activity.finish();
                 }
                 return;