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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d08a63a109ef4e4a14c266773266b216b17f5b
This commit is contained in:
Treehugger Robot
2021-01-06 05:19:19 +00:00
committed by Automerger Merge Worker
parent 8e18b5b69d 8677c6a4b7
commit e632315dc8
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/development/WirelessDebuggingPreferenceController.java
View File

@@ -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;