Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" (d3d0962c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/development/WirelessDebuggingPreferenceController.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@ import android.content.Context;
		import android.database.ContentObserver;
		import android.debug.IAdbManager;
		import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.Network;
		import android.net.NetworkCapabilities;
		import android.net.Uri;
		import android.os.Handler;
		import android.os.Looper;
		@@ -141,10 +142,16 @@ public class WirelessDebuggingPreferenceController extends DeveloperOptionsPrefe
		public static boolean isWifiConnected(Context context) {
		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
		Context.CONNECTIVITY_SERVICE);
		if (cm != null) {
		NetworkInfo info = cm.getActiveNetworkInfo();
		if (info != null && info.isConnected()) {
		return info.getType() == ConnectivityManager.TYPE_WIFI;
		if (cm == null) {
		return false;
		}
		for (Network network : cm.getAllNetworks()) {
		final NetworkCapabilities nc = cm.getNetworkCapabilities(network);
		if (nc == null) {
		continue;
		}
		if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
		return true;
		}
		}
		return false;