diff options
| author | Elliott Hughes <enh@google.com> | 2015-06-23 21:12:14 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-23 21:12:14 +0200 |
| commit | f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7 (patch) | |
| tree | 8f64384d0092be811e971c060402d542a8273794 | |
| parent | am deb4ebb2: am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected." (diff) | |
| parent | am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." (diff) | |
| download | android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar.gz android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar.bz2 android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar.lz android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar.xz android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.tar.zst android_bootable_recovery-f73a73443cfa3cbccc2c9eb0f1ad1236d6cc83c7.zip | |
| -rw-r--r-- | minadbd/adb_main.cpp | 6 |
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(); |