summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-11-25 21:52:12 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-03-05 14:52:04 +0900
commitf4f93b227fdea51ce2e2b0a4a8cb4029047462c5 (patch)
treecadff3c37e1b6fb707c219d66fa622721a2b4989 /services
parent6657dd3c79fd141efea6d90af540faab00b59362 (diff)
downloadframeworks_base-f4f93b227fdea51ce2e2b0a4a8cb4029047462c5.zip
frameworks_base-f4f93b227fdea51ce2e2b0a4a8cb4029047462c5.tar.gz
frameworks_base-f4f93b227fdea51ce2e2b0a4a8cb4029047462c5.tar.bz2
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
Diffstat (limited to 'services')
-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 334cdf6..0705fbd 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -677,7 +677,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);
}