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

Commit 88620caf authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Grant adb auth under recovery for unlocked & userdebug devices" am:... 

Merge "Grant adb auth under recovery for unlocked & userdebug devices" am: 7cfb77ed am: bc4645ad
am: 4ff05c44

Change-Id: I2efc0385d9f12ea8a4cd9a7d0bb3a77364687bc5
parents 2773e88d 4ff05c44

adb/daemon/main.cpp

+5 −1
Original line number Diff line number Diff line
@@ -205,7 +205,11 @@ int adbd_main(int server_port) { 
    // descriptor will always be open.

    adbd_cloexec_auth_socket();



#if defined(ALLOW_ADBD_NO_AUTH)

#if defined(__ANDROID_RECOVERY__)

    if (is_device_unlocked() || __android_log_is_debuggable()) {

        auth_required = false;

    }

#elif defined(ALLOW_ADBD_NO_AUTH)

    // If ro.adb.secure is unset, default to no authentication required.

    auth_required = android::base::GetBoolProperty("ro.adb.secure", false);

#elif defined(__ANDROID__)