commit 09cd6bd8f311b18e72186a5013bd10492f0b7e3c
author Yifan Hong <elsk@google.com> Thu Dec 15 12:25:19 2016 -0800
committer Yifan Hong <elsk@google.com> Thu Dec 15 12:33:58 2016 -0800
tree b70180bb729aa320356bdbaaa7d5c195d308f8a3
parent 63b95d84dcc2f8a1111402920eb99c03f41b978f

Do not register instrumentation callbacks if property is false.

Bug: 33645959

Test: hidl_test --gtest_filter="HidlTest.WrapTest"
Change-Id: Iebbfc67bfc6badf0f16f2378b6b58755194d60db

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 1e383a7..3cc4b14 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -156,7 +156,9 @@
 HidlInstrumentor::HidlInstrumentor(const std::string &prefix) {
     mEnableInstrumentation = property_get_bool("hal.instrumentation.enable",
                                                false);
-    registerInstrumentationCallbacks(prefix, &mInstrumentationCallbacks);
+    if (mEnableInstrumentation) {
+        registerInstrumentationCallbacks(prefix, &mInstrumentationCallbacks);
+    }
 }
 
 HidlInstrumentor:: ~HidlInstrumentor() {}