commit c958ae096a17a1bfaa52266a9b190e5c83705098
author Steven Moreland <smoreland@google.com> Fri Jan 22 18:17:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 22 18:17:37 2021 +0000
tree 54b1563f07bcb0d6f972d289c820ee4676aaa929
parent 3f90a7e59e2eed688864889e2c71d2035ec3b3c7
parent 7d1b0739fb4988da360db5e29b3e343bab5703ae

Merge "onRegistrationImpl: handle getTransport error"

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index e0813e1..b51c600 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -839,7 +839,13 @@
 
     if (kEnforceVintfManifest && !isTrebleTestingOverride()) {
         using Transport = IServiceManager1_0::Transport;
-        Transport transport = sm->getTransport(descriptor, name);
+        Return<Transport> transport = sm->getTransport(descriptor, name);
+
+        if (!transport.isOk()) {
+            LOG(ERROR) << "Could not get transport for " << descriptor << "/" << name << ": "
+                       << transport.description();
+            return UNKNOWN_ERROR;
+        }
 
         if (transport != Transport::HWBINDER) {
             LOG(ERROR) << "Service " << descriptor << "/" << name