From 3067fbce2ebd74432cba03313a15fd4ead56265d Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Tue, 9 Oct 2012 15:13:46 -0700
Subject: [PATCH] Return RESULT_OK when wifi connection established

Two new exit points were not setting a return result. Since the
default result for an activity is RESULT_CANCEL, Setup Wizard was
continuing as if no connection was made.

Bug: 7298234
Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
---
 src/com/android/settings/wifi/WifiSettings.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 61093e6f1d1..9c3f07fe8c7 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -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;