PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 18be472e: am 7f9b5681: am 553074f0: Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev

Browse Source 
* commit '18be472ef46d2320a98173a6d68d9d62b60b6ccc':
  Return RESULT_OK when wifi connection established
This commit is contained in:
Russell Brenner
2012-10-10 10:36:58 -07:00
committed by Android Git Automerger
parent d36e524206 18be472ef4
commit f3bc6c939f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -332,6 +332,7 @@ public class WifiSettings extends SettingsPreferenceFragment
activity.getSystemService(Context.CONNECTIVITY_SERVICE); activity.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity != null if (connectivity != null
&& connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) { && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
activity.setResult(Activity.RESULT_OK);
activity.finish(); activity.finish();
return; return;
} }
@@ -837,6 +838,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mAutoFinishOnConnection && info.isConnected()) { if (mAutoFinishOnConnection && info.isConnected()) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
activity.setResult(Activity.RESULT_OK);
activity.finish(); activity.finish();
} }
return; return;