summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-24 23:53:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-24 23:53:55 +0000
commit70385f3017366ecf06af7a073a2fb955e93d01ba (patch)
tree01ade466ec6087a47e501089dce571c930288e77 /adb
parent17f267905b6be932e1ff1559d84a5517e6b4b803 (diff)
parentabd6773b41effd1e1005ad7ce8cb5e370a367302 (diff)
downloadsystem_core-70385f3017366ecf06af7a073a2fb955e93d01ba.zip
system_core-70385f3017366ecf06af7a073a2fb955e93d01ba.tar.gz
system_core-70385f3017366ecf06af7a073a2fb955e93d01ba.tar.bz2
Merge "Remove the emulator special case from the "adb root" code."
Diffstat (limited to 'adb')
-rw-r--r--adb/adb_main.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/adb/adb_main.c b/adb/adb_main.c
index 02acae2..57a15dd 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.