aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-06-23 11:12:58 -0700
committerThe Android Automerger <android-build@google.com>2015-06-23 13:57:09 -0700
commitafc7a78349160743b206ed89aed401c3d2d45761 (patch)
tree852bf78adcee99b971faacda012fb78bb9ea0bec
parentd6d34c7ac609bcdd826fd1222261b29e664ce4e7 (diff)
downloadbootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.zip
bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.gz
bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.bz2
Allow sideloading without authentication.
Bug: http://b/22025550 Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf (cherry picked from commit 9813f5ba57fe7d90d45cb1c2b6f65920ce580e72)
-rw-r--r--minadbd/adb_main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index f6e2401..7fae99a 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)
@@ -35,6 +36,9 @@ int adb_main(int is_daemon, int server_port)
// No SIGCHLD. Let the service subproc handle its children.
signal(SIGPIPE, SIG_IGN);
+ // We can't require authentication for sideloading. http://b/22025550.
+ auth_required = false;
+
init_transport_registration();
usb_init();