commit e9c0f9f4d04922f9b5eae509e6c3886884e9c6c9
author Casey Dahlin <sadmac@google.com> Fri Mar 10 03:16:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 03:16:02 2017 +0000
tree 6d2c8d63f417af6320ffc3c78e4c42b6cfd6c0e4
parent 1f4794d02d3bc1cf9d5b5ed7124976465391aa9b
parent 78d28b073a897a8bc7257d4c0215ce9501af4040

adb: Set a hostname for mDNS am: 1fe3cae67e am: f18d33c2c6
am: 0b13090ac7

Change-Id: I84093fc1f5e652e401333c428c9a200de4f02890

adb/daemon/mdns.cpp

diff --git a/adb/daemon/mdns.cpp b/adb/daemon/mdns.cpp
index 85c5a07..a8622ae 100644
--- a/adb/daemon/mdns.cpp
+++ b/adb/daemon/mdns.cpp
@@ -61,9 +61,13 @@
     start_mdns();
     std::lock_guard<std::mutex> lock(mdns_lock);
 
-    auto error = DNSServiceRegister(&mdns_ref, 0, 0, nullptr, "_adb._tcp",
-                                    nullptr, nullptr, htobe16((uint16_t)port),
-                                    0, nullptr, mdns_callback, nullptr);
+    std::string hostname = "adb-";
+    hostname += android::base::GetProperty("ro.serialno", "unidentified");
+
+    auto error = DNSServiceRegister(&mdns_ref, 0, 0, hostname.c_str(),
+                                    kADBServiceType, nullptr, nullptr,
+                                    htobe16((uint16_t)port), 0, nullptr,
+                                    mdns_callback, nullptr);
 
     if (error != kDNSServiceErr_NoError) {
         LOG(ERROR) << "Could not register mDNS service (" << error << ").";