From abd6773b41effd1e1005ad7ce8cb5e370a367302 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 24 Feb 2015 14:10:51 -0800 Subject: [PATCH] Remove the emulator special case from the "adb root" code. The emulator is essential an "eng" build, so the regular properties should suffice. Change-Id: Id63b3918f9b0b04b0d887ed886535b9976a9cc85 --- adb/adb_main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/adb/adb_main.c b/adb/adb_main.c index 02acae28c..57a15dd85 100644 --- a/adb/adb_main.c +++ b/adb/adb_main.c @@ -108,13 +108,6 @@ static bool should_drop_privileges() { #if defined(ALLOW_ADBD_ROOT) char value[PROPERTY_VALUE_MAX]; - // The emulator is never secure, so don't drop privileges there. - // TODO: this seems like a bug --- shouldn't the emulator behave like a device? - property_get("ro.kernel.qemu", value, ""); - if (strcmp(value, "1") == 0) { - return false; - } - // The properties that affect `adb root` and `adb unroot` are ro.secure and // ro.debuggable. In this context the names don't make the expected behavior // particularly obvious.