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

Commit aeec68d5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support wireless ADB for ethernet only devices."

parents 44a36944 78b75702

services/core/java/com/android/server/adb/AdbService.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**