commit f35fe9f743e862149942c8713e9e5086ecbf903f
author Roman Kiryanov <rkir@google.com> Tue Jan 19 20:28:26 2021 -0800
committer Roman Kiryanov <rkir@google.com> Wed Jan 20 13:05:36 2021 -0800
tree 90ddab82f28f81cb1b8baad851846f2366790b41
parent 8e589c8d9dfa95ade47eebd6aa84368bb6440063

Retire references to the `ro.kernel.qemu` property from adbd

we are replacing /dev/goldfish_pipe with
virtio-vsock. Ther will be no emulator specific
code in adbd.

Bug: 174866369
Test: boot the system image, check if adb works
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Id5f1956712ebc2e20f4a7d25d07c8369ac3d7842

daemon/transport_qemu.cpp

diff --git a/daemon/transport_qemu.cpp b/daemon/transport_qemu.cpp
index e458cea..5b08b4d 100644
--- a/daemon/transport_qemu.cpp
+++ b/daemon/transport_qemu.cpp
@@ -126,19 +126,8 @@
 }
 
 // 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.
+// goldfish) as the transport. This is explicitly set by the
+// service.adb.transport property.
 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;
+    return android::base::GetProperty("service.adb.transport", "") == "goldfish";
 }