am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""

* commit '8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd':
  Revert "Remove the emulator special case from the "adb root" code."
This commit is contained in:
Dan Albert 2015-03-28 19:07:43 +00:00 committed by Android Git Automerger
commit 68d54808df
1 changed files with 7 additions and 0 deletions

View File

@ -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.