commit a9fb83d5706b9596893df01f7aca90025e657c54
author Josh Gao <jmgao@google.com> Wed Mar 07 21:35:16 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 07 21:35:16 2018 +0000
tree 62777c1302c01f2224b2c14854a24955134e4372
parent a2ec913cebc812c370d314046101cfe1bbeba29d
parent 87d5e7e93bc8baee4daf8daaa37d1cca9a0f5e8c

Merge "adbd: don't require authentication for userdebug/eng builds."
am: bf62136be4

Change-Id: If4e96ff8238ab5d2537d6c642ab59e13b49a2a6c

adb/daemon/main.cpp

diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index 9b25a07..4314dae 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -159,7 +159,8 @@
     adbd_cloexec_auth_socket();
 
 #if defined(ALLOW_ADBD_NO_AUTH)
-    auth_required = android::base::GetBoolProperty("ro.adb.secure", true);
+    // If ro.adb.secure is unset, default to no authentication required.
+    auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
 #endif
 
     adbd_auth_init();