diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-10-10 10:31:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 10:31:59 -0700 |
| commit | 553074f0fc2aa46f44797b72f1457146697645b6 (patch) | |
| tree | e7813c630694d58fb91531931e40e8e020e4fc37 | |
| parent | 7f2824b924775e78192fb12c342b38558cf304b5 (diff) | |
| parent | 3067fbce2ebd74432cba03313a15fd4ead56265d (diff) | |
| download | packages_apps_settings-553074f0fc2aa46f44797b72f1457146697645b6.zip packages_apps_settings-553074f0fc2aa46f44797b72f1457146697645b6.tar.gz packages_apps_settings-553074f0fc2aa46f44797b72f1457146697645b6.tar.bz2 | |
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
| -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 61093e6..9c3f07f 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; |