am 687bf071: am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."
* commit '687bf071ad5f19a1fe91569f47e474e6e9a239d7':
Allow sideloading without authentication.
diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 0e65386..724f39c 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -19,11 +19,12 @@
#include <stdio.h>
#include <stdlib.h>
-#define TRACE_TAG TRACE_ADB
+#define TRACE_TAG TRACE_ADB
#include "sysdeps.h"
#include "adb.h"
+#include "adb_auth.h"
#include "transport.h"
int adb_main(int is_daemon, int server_port) {
@@ -31,6 +32,9 @@
signal(SIGPIPE, SIG_IGN);
+ // We can't require authentication for sideloading. http://b/22025550.
+ auth_required = false;
+
init_transport_registration();
usb_init();