commit c6ce6e50a77c08a17a28013599469b83d11049b0
author Yifan Hong <elsk@google.com> Fri Dec 15 19:32:24 2017 +0000
committer Yifan Hong <elsk@google.com> Fri Dec 15 19:39:35 2017 +0000
tree 521abce1530b3409d4e05d6a19b396c653d84886
parent c67f65df9a9832094df79c4f02dffa25ca2bb2b1

Revert "Remove gBn/sConstructorMap."

This reverts commit c67f65df9a9832094df79c4f02dffa25ca2bb2b1.

Reason for revert: Break internal targets
Bug: 69122224
Bug: 70720496

Change-Id: I6373330871b504999653b4c0bad6bdd7111c25be

transport/include/hidl/HidlBinderSupport.h

diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index 55003cc..9759af1 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -332,7 +332,10 @@
         if (sBnObj == nullptr) {
             auto func = details::getBnConstructorMap().get(myDescriptor, nullptr);
             if (!func) {
-                return nullptr;
+                func = details::gBnConstructorMap.get(myDescriptor, nullptr);
+                if (!func) {
+                    return nullptr;
+                }
             }
 
             sBnObj = sp<IBinder>(func(static_cast<void*>(ifacePtr)));