commit 6538e7515b00694574b222da2898716e3cb1431a
author Steven Moreland <smoreland@google.com> Thu Feb 08 16:49:23 2018 +0000
committer Steven Moreland <smoreland@google.com> Thu Feb 08 16:49:23 2018 +0000
tree bcf05c8d5b280e86ce08024368ecad72f117d11d
parent d7687b2a89d374d8403b4c6c7f94a21c747aa66f

Revert "Reland "Remove gBn/sConstructorMap.""

This reverts commit d7687b2a89d374d8403b4c6c7f94a21c747aa66f.

Reason for revert: b/73103210

Change-Id: Ibd956944c49f4b1a2e51992a4d199a60cd64d7b5

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)));