commit e22233582b5f8638f7983bf1529d734e9516b378
author Pawin Vongmasa <pawin@google.com> Thu Jun 14 17:12:02 2018 -0700
committer Pawin Vongmasa <pawin@google.com> Thu Jun 14 18:56:34 2018 -0700
tree b8c5c21764891832b99ce98f63c6779db8c68a5f
parent 6c949e82a90c9c9006404b8fd275e8cec30f80c3

Component: Handle null blockpool properly

Test: adb shell setprop debug.stagefright.ccodec 3
adb shell killall mediaserver
* Then, play videos.

Bug: 110234179
Change-Id: I0b360b1735dcff9170b61e0903fc30920c20b623

codec2/hidl/1.0/utils/Component.cpp

diff --git a/codec2/hidl/1.0/utils/Component.cpp b/codec2/hidl/1.0/utils/Component.cpp
index 8f04e55..f5c3cc7 100644
--- a/codec2/hidl/1.0/utils/Component.cpp
+++ b/codec2/hidl/1.0/utils/Component.cpp
@@ -278,7 +278,9 @@
 
 struct BlockPoolIntf : public ConfigurableC2Intf {
     BlockPoolIntf(const std::shared_ptr<C2BlockPool>& pool) :
-        ConfigurableC2Intf("C2BlockPool:" + std::to_string(pool->getLocalId())),
+        ConfigurableC2Intf("C2BlockPool:" +
+                           (pool ? std::to_string(pool->getLocalId()) :
+                           "null")),
         mPool(pool) {
     }