summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2014-11-25 21:52:12 +0900
committer Lorenzo Colitti <lorenzo@google.com> 2015-03-05 16:06:43 +0900
commit0ea7b1b094def6b4db6b9b50df2e7dbf44c5c5ad (patch)
treee819b1a3b1daf6d99fba0f07a7b632a99d22b5fd
parent1569f98ce18c696d624af56a22a47f772d51b7c8 (diff)
Enable Ethernet if the device has FEATURE_USB_HOST.
Any device that supports USB OTG is capable of running Ethernet via a USB OTG cable and Ethernet to USB adapter. Currently, we only start the Ethernet system service if the device has FEATURE_ETHERNET, but this requires that every device explicitly declare FEATURE_ETHERNET, which causes bugs like http://b/18515146 , where the L OTA broke Ethernet on nakasi. Therefore, start the Ethernet service on all devices that have FEATURE_USB_HOST. Bug: 18515146 Change-Id: I3b4e85d1ad8e1aea9baa046a27f5b4dd68c42028
-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);
}