Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8677c6a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
parents d2a2867d d3d0962c

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;