commit a53e154eed056ae3cc9ca7b7401a2fe520ec3f60
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Jun 17 01:29:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 17 01:29:05 2020 +0000
tree 4dca1ced7e0c09565664f049e284ca90c3e50837
parent f7daebd5051a193a867f382f5ca83fe07a1a2a93
parent 492ce367571240d1dc8596cb7188a29219a3d383

Merge "Merge cherrypicks of [1340645] into sdk-release" into sdk-release

adb/client/transport_mdns.cpp

diff --git a/adb/client/transport_mdns.cpp b/adb/client/transport_mdns.cpp
index 9db2453..9611212 100644
--- a/adb/client/transport_mdns.cpp
+++ b/adb/client/transport_mdns.cpp
@@ -680,6 +680,13 @@
 std::optional<MdnsInfo> mdns_get_connect_service_info(std::string_view name) {
     CHECK(!name.empty());
 
+    // only adb server creates these registries
+    if (!ResolvedService::sAdbTransportServices && !ResolvedService::sAdbSecureConnectServices) {
+        return std::nullopt;
+    }
+    CHECK(ResolvedService::sAdbTransportServices);
+    CHECK(ResolvedService::sAdbSecureConnectServices);
+
     auto mdns_instance = mdns::mdns_parse_instance_name(name);
     if (!mdns_instance.has_value()) {
         D("Failed to parse mDNS name [%s]", name.data());