tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c

Browse source 
am: 516ee2445d

Change-Id: Iaf3be508465ea6ab59fc6a7f4fb0b2878d50b279
This commit is contained in:
Nicolas Norvez 2017-06-12 21:48:35 +00:00 committed by android-build-merger
commit 6ff249f483
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
adb/transport_local.cpp
View file

@ -388,6 +388,25 @@ static void qemu_socket_thread(int port) {
D("transport: qemu_socket_thread() exiting");
return;
}
// If adbd is running inside the emulator, it will normally use QEMUD pipe (aka
// goldfish) as the transport. This can either be explicitly set by the
// service.adb.transport property, or be inferred from ro.kernel.qemu that is
// set to "1" for ranchu/goldfish.
static bool use_qemu_goldfish() {
// Legacy way to detect if adbd should use the goldfish pipe is to check for
// ro.kernel.qemu, keep that behaviour for backward compatibility.
if (android::base::GetBoolProperty("ro.kernel.qemu", false)) {
return true;
}
// If service.adb.transport is present and is set to "goldfish", use the
// QEMUD pipe.
if (android::base::GetProperty("service.adb.transport", "") == "goldfish") {
return true;
}
return false;
}
#endif // !ADB_HOST
void local_init(int port)
@ -401,13 +420,7 @@ void local_init(int port)
#else
// For the adbd daemon in the system image we need to distinguish
// between the device, and the emulator.
if (android::base::GetBoolProperty("ro.kernel.qemu", false)) {
// Running inside the emulator: use QEMUD pipe as the transport.
func = qemu_socket_thread;
} else {
// Running inside the device: use TCP socket as the transport.
func = server_socket_thread;
}
func = use_qemu_goldfish() ? qemu_socket_thread : server_socket_thread;
debug_name = "server";
#endif // !ADB_HOST