commit bc4ece364489237a12528cea8a8d6ceb7c8cf2b7
author Steven Moreland <smoreland@google.com> Tue Sep 26 16:56:51 2017 -0700
committer Steven Moreland <smoreland@google.com> Wed Sep 27 15:19:27 2017 +0000
tree 51e9c1b9f3a54697451e152ec856b8af5c17a89e
parent abf0ea142624a53f1fecf768ff903ecf19065b8d

libhidladapter: handle nullptr interface

Bug: 37518178
Test: adapt ashmem hal and have YT get memory from it
Change-Id: I4cbecde14d4c175cd8acc21719fc5d08570896c4

adapter/HidlBinderAdapter.cpp

diff --git a/adapter/HidlBinderAdapter.cpp b/adapter/HidlBinderAdapter.cpp
index e769cb5..4efe9fb 100644
--- a/adapter/HidlBinderAdapter.cpp
+++ b/adapter/HidlBinderAdapter.cpp
@@ -109,6 +109,10 @@
                            const std::function<sp<IBase>()>& makeDefault) {
     static std::map<sp<IBase>, sp<IBase>> sAdapterMap;
 
+    if (something == nullptr) {
+        return something;
+    }
+
     auto it = sAdapterMap.find(something);
     if (it == sAdapterMap.end()) {
         it = sAdapterMap.insert(it, {something, makeDefault()});