commit 13bc621b373985ab3d203c697029db04778f6dc7
author Steven Moreland <smoreland@google.com> Wed Mar 14 20:16:18 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 14 20:16:18 2018 +0000
tree 8e0dc4ba26aee7a1922609a10fd731e3ee37467c
parent b87d2e4610a556fe5dee30141263a42354acf364
parent e3c521fd8dd6660eed7b95e1f8bce0b61f1d66fb

registerReferences registers absolute subclass am: e69e8d3d3f
am: e3c521fd8d

Change-Id: Ifaf409f23ba7a7a15d6fdfcc75fcbf96131ad40e

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index dd6736f..edd2af3 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -30,6 +30,7 @@
 
 #include <hidl/HidlBinderSupport.h>
 #include <hidl/HidlInternal.h>
+#include <hidl/HidlTransportUtils.h>
 #include <hidl/ServiceManagement.h>
 #include <hidl/Status.h>
 
@@ -357,7 +358,12 @@
                 return true; // this module doesn't provide this instance name
             }
 
-            registerReference(fqName, name);
+            // Actual fqname might be a subclass.
+            // This assumption is tested in vts_treble_vintf_test
+            using ::android::hardware::details::getDescriptor;
+            std::string actualFqName = getDescriptor(ret.get());
+            CHECK(actualFqName.size() > 0);
+            registerReference(actualFqName, name);
             return false;
         });