am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication."

* commit '6dd443fd51062efb4eae87b8f0e1f6cebf332b37':
  Allow sideloading without authentication.
This commit is contained in:
Elliott Hughes
2015-06-23 18:58:47 +00:00
committed by Android Git Automerger
+5 -1
View File
@@ -19,11 +19,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define TRACE_TAG TRACE_ADB #define TRACE_TAG TRACE_ADB
#include "sysdeps.h" #include "sysdeps.h"
#include "adb.h" #include "adb.h"
#include "adb_auth.h"
#include "transport.h" #include "transport.h"
int adb_main(int is_daemon, int server_port) { 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); signal(SIGPIPE, SIG_IGN);
// We can't require authentication for sideloading. http://b/22025550.
auth_required = false;
init_transport_registration(); init_transport_registration();
usb_init(); usb_init();