commit 37b3620ce11288ad970bc7052b8bb76b17419474
author Yifan Hong <elsk@google.com> Tue Feb 28 16:04:22 2017 -0800
committer Yifan Hong <elsk@google.com> Wed Mar 01 11:41:08 2017 -0800
tree 0cb4258923aeb1776ef6e335e5dd7b4f7ea10e2a
parent 0126889103d84c2078896688017d61d612a12c4f

getTransport checks interface and instance names.

If <interface> is missing from the manifest, it returns
<transport> only if instanceName == "default", and EMPTY
otherwise.

Bug: 35219444
Test: hidl_test
Test: camera, soundtrigger works on marlin
Test: video playback works on marlin
Change-Id: Iaae6ae9bbf5f8c97fae63f2ac41595d822f781ca

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 37f40c4..91d56e7 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -29,7 +29,8 @@
 namespace hardware {
 
 vintf::Transport getTransportFromManifest(
-        const FQName &fqName, const std::string &manifestName,
+        const FQName &fqName, const std::string &instanceName,
+        const std::string &manifestName,
         const vintf::HalManifest *vm) {
     if (vm == nullptr) {
         LOG(WARNING) << "getTransportFromManifest: No " << manifestName << " manifest defined, "
@@ -37,7 +38,8 @@
         return vintf::Transport::EMPTY;
     }
     vintf::Transport tr = vm->getTransport(fqName.package(),
-            vintf::Version{fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()});
+            vintf::Version{fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()},
+            fqName.name(), instanceName);
     if (tr == vintf::Transport::EMPTY) {
         LOG(WARNING) << "getTransportFromManifest: Cannot find entry "
                      << fqName.string()
@@ -50,10 +52,10 @@
     return tr;
 }
 
-vintf::Transport getTransport(const std::string &name) {
-    FQName fqName(name);
+vintf::Transport getTransport(const std::string &interfaceName, const std::string &instanceName) {
+    FQName fqName(interfaceName);
     if (!fqName.isValid()) {
-        LOG(ERROR) << "getTransport: " << name << " is not a valid fully-qualified name.";
+        LOG(ERROR) << "getTransport: " << interfaceName << " is not a valid fully-qualified name.";
         return vintf::Transport::EMPTY;
     }
     if (!fqName.hasVersion()) {
@@ -61,12 +63,17 @@
                    << " does not specify a version. Using default transport.";
         return vintf::Transport::EMPTY;
     }
+    if (fqName.name().empty()) {
+        LOG(ERROR) << "getTransport: " << fqName.string()
+                   << " does not specify an interface name. Using default transport.";
+        return vintf::Transport::EMPTY;
+    }
     // TODO(b/34772739): modify the list if other packages are added to system/manifest.xml
     if (fqName.inPackage("android.hidl")) {
-        return getTransportFromManifest(fqName, "framework",
+        return getTransportFromManifest(fqName, instanceName, "framework",
                 vintf::VintfObject::GetFrameworkHalManifest());
     }
-    return getTransportFromManifest(fqName, "device",
+    return getTransportFromManifest(fqName, instanceName, "device",
             vintf::VintfObject::GetDeviceHalManifest());
 }