Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868402e5 authored by Dan Albert's avatar Dan Albert
Browse files

Revert "Remove the emulator special case from the "adb root" code." 

adb root doesn't work on the emulator, so this prevents root access
to a userdebug emulator.

Since the emulator has always been root even on userdebug builds, it
may be that adb root has never worked on the emulator.

Bug: 19974213

This reverts commit abd6773b.
parent e29744d9

adb/adb_main.cpp

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ 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.