commit cdc9c6a589d2547083df92243fe922c43f5dcf8a
author Joshua Duong <joshuaduong@google.com> Mon May 03 12:57:07 2021 -0700
committer Joshua Duong <joshuaduong@google.com> Mon May 03 12:57:07 2021 -0700
tree ea020e78f8de31c5ee173d84222bbb063be2ffec
parent 0d944e369e33843d07ab0a3467e57f96ec8ee91e

Fix 'adb mdns check' when ADB_MDNS=0.

The message should say that mdns discovery is disabled.

Bug: 185828480

Test: ADB_MDNS=0 adb start-server; adb mdns check
Change-Id: I73a9532f3af808e0d802e98714d3413132a0e649

client/transport_mdns.cpp

diff --git a/client/transport_mdns.cpp b/client/transport_mdns.cpp
index 843aca8..8fafdb7 100644
--- a/client/transport_mdns.cpp
+++ b/client/transport_mdns.cpp
@@ -276,6 +276,10 @@
 }
 
 std::string mdns_check() {
+    if (!g_state && !g_using_bonjour) {
+        return "ERROR: mdns discovery disabled";
+    }
+
     if (g_using_bonjour) {
         return g_adb_mdnsresponder_funcs.mdns_check();
     }