diff options
| author | Josh Gao <jmgao@google.com> | 2020-03-02 20:46:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-02 20:46:15 +0000 |
| commit | 9978c367548fa29473bef75dc5836000d10ad71c (patch) | |
| tree | ce5381761474a3bbc1800c2abf03b665a233e65d /adb/adb.cpp | |
| parent | acb49fd07d328d6cb87fd8d9bdf49fbbaffe58a4 (diff) | |
| parent | bbe3385097750842a8d87b9d3d0248c937dcdb97 (diff) | |
Merge changes Ib97acc6d,I8f14004a,Id5bbfd6d,I4dfc3f52 into rvc-dev
* changes:
adbd: add runtime-configurable logging.
adb: don't hardcode ports in test_adb.
adbd: add usb thread spawn logging.
base: add CachedProperty.
Diffstat (limited to 'adb/adb.cpp')
| -rw-r--r-- | adb/adb.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/adb/adb.cpp b/adb/adb.cpp index 554a754fdc..98db191231 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -34,6 +34,7 @@ #include <condition_variable> #include <mutex> #include <string> +#include <string_view> #include <thread> #include <vector> @@ -61,6 +62,8 @@ #include <sys/mount.h> #include <android-base/properties.h> using namespace std::chrono_literals; + +#include "daemon/logging.h" #endif std::string adb_version() { @@ -312,6 +315,9 @@ static void handle_new_connection(atransport* t, apacket* p) { #if ADB_HOST handle_online(t); #else + ADB_LOG(Connection) << "received CNXN: version=" << p->msg.arg0 << ", maxdata = " << p->msg.arg1 + << ", banner = '" << banner << "'"; + if (t->use_tls) { // We still handshake in TLS mode. If auth_required is disabled, // we'll just not verify the client's certificate. This should be the |