aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-06-23 18:33:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-23 18:33:41 +0000
commitea13fe233e8a95d9e5b69b131fbf840a60d1f04e (patch)
tree8f64384d0092be811e971c060402d542a8273794
parent22ccc87a7dffd089662a111aa96127b3476d65fc (diff)
parent9813f5ba57fe7d90d45cb1c2b6f65920ce580e72 (diff)
downloadandroid_bootable_recovery-ea13fe233e8a95d9e5b69b131fbf840a60d1f04e.tar.gz
android_bootable_recovery-ea13fe233e8a95d9e5b69b131fbf840a60d1f04e.tar.bz2
android_bootable_recovery-ea13fe233e8a95d9e5b69b131fbf840a60d1f04e.zip
Merge "Allow sideloading without authentication."
-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 0e65386c..724f39c1 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 @@ int adb_main(int is_daemon, int server_port) {
signal(SIGPIPE, SIG_IGN);
+ // We can't require authentication for sideloading. http://b/22025550.
+ auth_required = false;
+
init_transport_registration();
usb_init();