commit d3d0962cd15c0f104ac7c2a205cd6e66726a69e2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 06 04:24:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 06 04:24:25 2021 +0000
tree b25b76d5ba408f9ac6a99ed54bf3545828f37f28
parent 30364048ce55a723d2b087bb064c89a4d1b7e36e
parent 620158be52e260ade3226a302f313cad2166bdfa

Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default"

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

diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
index a3daede..c17803d 100644
--- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
+++ b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
@@ -20,7 +20,8 @@
 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 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;