summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2015-03-05 08:23:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-03-05 08:23:32 +0000
commitbe93f28d5b018859ad33423cd938fe730cd26313 (patch)
tree4161f3bd509f548901065c3e89577b91427a16de
parent49c00ffbad00ff6de5a74cbc3f8606aa7c12cb6b (diff)
parent0ea7b1b094def6b4db6b9b50df2e7dbf44c5c5ad (diff)
Merge "Enable Ethernet if the device has FEATURE_USB_HOST."
-rw-r--r--services/java/com/android/server/SystemServer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index cd6e7866b02c..a0c7f864b6e1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -669,7 +669,8 @@ public final class SystemServer {
mSystemServiceManager.startService("com.android.server.wifi.RttService");
- if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET)) {
+ if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||
+ mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {
mSystemServiceManager.startService(ETHERNET_SERVICE_CLASS);
}