From 78b7570291d3d12b141866005d30ad5203d5d42e Mon Sep 17 00:00:00 2001
From: jingjiangli <jingjiangli@google.com>
Date: Mon, 6 Dec 2021 22:45:34 -0800
Subject: [PATCH] Support wireless ADB for ethernet only devices.

Test: Presubmit check
Bug: b/208986481
Change-Id: Ic5ce1546ed304b48d2640ad907947ffcafc3e2ec
---
 services/core/java/com/android/server/adb/AdbService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/adb/AdbService.java b/services/core/java/com/android/server/adb/AdbService.java
index 7a4d2ce50cd3f..7b62fa6fa5484 100644
--- a/services/core/java/com/android/server/adb/AdbService.java
+++ b/services/core/java/com/android/server/adb/AdbService.java
@@ -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);
     }
 
     /**