Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev (553074f0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;