diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-10-09 15:13:46 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2012-10-09 16:17:12 -0700 |
| commit | 3067fbce2ebd74432cba03313a15fd4ead56265d (patch) | |
| tree | 917deb192bb7da3ea62a8290fdadd28bae085c2a /src/com/android/settings/wifi | |
| parent | 2fc940351f907e3bea533363bd4a103be65c3855 (diff) | |
| download | packages_apps_Settings-3067fbce2ebd74432cba03313a15fd4ead56265d.tar.gz packages_apps_Settings-3067fbce2ebd74432cba03313a15fd4ead56265d.tar.bz2 packages_apps_Settings-3067fbce2ebd74432cba03313a15fd4ead56265d.zip | |
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
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 61093e6f1..9c3f07fe8 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; |