summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-06-23 20:12:58 +0200
committerThe Android Automerger <android-build@google.com>2015-06-23 22:57:09 +0200
commitafc7a78349160743b206ed89aed401c3d2d45761 (patch)
tree852bf78adcee99b971faacda012fb78bb9ea0bec
parentmerge in mnc-release history after reset to mnc-dev (diff)
downloadandroid_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.gz
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.bz2
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.lz
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.xz
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.tar.zst
android_bootable_recovery-afc7a78349160743b206ed89aed401c3d2d45761.zip
-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 f6e240108..7fae99a9a 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();