Merge "Support wireless ADB for ethernet only devices."
This commit is contained in:
committed by
Android (Google) Code Review
commit
aeec68d59f
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user