diff options
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bb61b81..3102cce 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -65,6 +65,7 @@ import com.android.server.display.DisplayManagerService; import com.android.server.dreams.DreamManagerService; import com.android.server.hdmi.HdmiControlService; import com.android.server.input.InputManagerService; +import com.android.server.job.JobSchedulerService; import com.android.server.lights.LightsManager; import com.android.server.lights.LightsService; import com.android.server.media.MediaRouterService; @@ -84,7 +85,6 @@ import com.android.server.restrictions.RestrictionsManagerService; import com.android.server.search.SearchManagerService; import com.android.server.statusbar.StatusBarManagerService; import com.android.server.storage.DeviceStorageMonitorService; -import com.android.server.task.TaskManagerService; import com.android.server.trust.TrustManagerService; import com.android.server.tv.TvInputManagerService; import com.android.server.twilight.TwilightService; @@ -132,8 +132,8 @@ public final class SystemServer { "com.android.server.wifi.p2p.WifiP2pService"; private static final String ETHERNET_SERVICE_CLASS = "com.android.server.ethernet.EthernetService"; - private static final String TASK_SERVICE_CLASS = - "com.android.server.task.TaskManagerService"; + private static final String JOB_SCHEDULER_SERVICE_CLASS = + "com.android.server.job.JobSchedulerService"; private final int mFactoryTestMode; private Timer mProfilerSnapshotTimer; @@ -349,6 +349,7 @@ public final class SystemServer { boolean disableSystemUI = SystemProperties.getBoolean("config.disable_systemui", false); boolean disableNonCoreServices = SystemProperties.getBoolean("config.disable_noncore", false); boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false); + boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1"); try { Slog.i(TAG, "Telephony Registry"); @@ -461,7 +462,7 @@ public final class SystemServer { // Skip Bluetooth if we have an emulator kernel // TODO: Use a more reliable check to see if this product should // support Bluetooth - see bug 988521 - if (SystemProperties.get("ro.kernel.qemu").equals("1")) { + if (isEmulator) { Slog.i(TAG, "No Bluetooh Service (emulator)"); } else if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) { Slog.i(TAG, "No Bluetooth Service (factory test)"); @@ -662,10 +663,17 @@ public final class SystemServer { reportWtf("starting Wi-Fi Scanning Service", e); } - try { - mSystemServiceManager.startService(ETHERNET_SERVICE_CLASS); - } catch (Throwable e) { - reportWtf("starting Ethernet Service", e); + if (!isEmulator) { + try { + mSystemServiceManager.startService(ETHERNET_SERVICE_CLASS); + } catch (Throwable e) { + reportWtf("starting Ethernet Service", e); + } + } else { + // Don't start the Ethernet service on the emulator because + // it interferes with qemu's SLIRP emulation, which uses + // IPv4 over eth0. http://b/15341003 . + Slog.i(TAG, "Not starting Ethernet service (emulator)"); } try { @@ -826,7 +834,7 @@ public final class SystemServer { mSystemServiceManager.startService(UiModeManagerService.class); - mSystemServiceManager.startService(TaskManagerService.class); + mSystemServiceManager.startService(JobSchedulerService.class); if (!disableNonCoreServices) { try { |