ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tianjie Xu 2019-11-05 21:37:07 +00:00 • committed by Gerrit Code Review
commit 7cfb77ed8d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/daemon/main.cpp
View file

@ -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__)