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
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;