drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't enable Ethernet on the emulator.

Browse Source 
Don't start the Ethernet service on the emulator because it
interferes with qemu's SLIRP emulation, which uses IPv4 over
eth0.

Bug: 15341003
Change-Id: I4041a17b19a4861cae4fbf47ab5e05b007385e19
This commit is contained in:
Lorenzo Colitti
2014-06-10 14:51:30 +09:00
parent 465c5de4ee
commit beacf8d64c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/SystemServer.java
View File

@ -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 {