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

am: bf62136be4 Change-Id: If4e96ff8238ab5d2537d6c642ab59e13b49a2a6c
2018-03-07 21:35:16 +00:00 · 2018-03-07 21:35:16 +00:00 · 0360ada8f5
parent a97acb8f83 bf62136be4
commit 0360ada8f5
1 changed files with 2 additions and 1 deletions
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@ -159,7 +159,8 @@ int adbd_main(int server_port) {
    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();