diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-05-22 05:55:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 05:55:56 +0000 |
| commit | 521d8cdae0be5c7d33715e0fa7b5b85367c5de09 (patch) | |
| tree | 29174c64809f7e23c6930f800e4596a35ea5672c /services | |
| parent | e2c7a764644424311930b6f7c3681d40b4f2417c (diff) | |
| parent | f9ff2c9ae5595a20d77b10a41386932de1fc2da2 (diff) | |
| download | frameworks_base-521d8cdae0be5c7d33715e0fa7b5b85367c5de09.zip frameworks_base-521d8cdae0be5c7d33715e0fa7b5b85367c5de09.tar.gz frameworks_base-521d8cdae0be5c7d33715e0fa7b5b85367c5de09.tar.bz2 | |
Merge "Make the EthernetManager available."
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 55ae9c6..de46b16 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -130,6 +130,8 @@ public final class SystemServer { "com.android.server.wifi.p2p.WifiP2pService"; private static final String HDMI_CEC_SERVICE_CLASS = "com.android.server.hdmi.HdmiCecService"; + private static final String ETHERNET_SERVICE_CLASS = + "com.android.server.ethernet.EthernetService"; private final int mFactoryTestMode; private Timer mProfilerSnapshotTimer; @@ -660,6 +662,12 @@ public final class SystemServer { } try { + mSystemServiceManager.startService(ETHERNET_SERVICE_CLASS); + } catch (Throwable e) { + reportWtf("starting Ethernet Service", e); + } + + try { Slog.i(TAG, "Connectivity Service"); connectivity = new ConnectivityService( context, networkManagement, networkStats, networkPolicy); |