Merge "Support wireless ADB for ethernet only devices."

This commit is contained in:
TreeHugger Robot
2022-02-05 03:51:03 +00:00
committed by Android (Google) Code Review

View File

@@ -311,14 +311,15 @@ public class AdbService extends IAdbManager.Stub {
}
/**
* @return true if the device supports secure ADB over Wi-Fi.
* @return true if the device supports secure ADB over Wi-Fi or Ethernet.
* @hide
*/
@Override
public boolean isAdbWifiSupported() {
mContext.enforceCallingPermission(
android.Manifest.permission.MANAGE_DEBUGGING, "AdbService");
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI);
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI) ||
mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_ETHERNET);
}
/**