summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-06-23 20:58:47 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-23 20:58:47 +0200
commit687bf071ad5f19a1fe91569f47e474e6e9a239d7 (patch)
tree8f64384d0092be811e971c060402d542a8273794
parentam d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected." (diff)
parentam ea13fe23: Merge "Allow sideloading without authentication." (diff)
downloadandroid_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar.gz
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar.bz2
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar.lz
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar.xz
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.tar.zst
android_bootable_recovery-687bf071ad5f19a1fe91569f47e474e6e9a239d7.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 0e65386c4..724f39c1d 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();