release-request-8a29fe1b-a466-48e3-824a-9b3737e5c08a-for-git_oc-release-4115999 snap-temp-L30600000075741665
Change-Id: Ic8d83abf082f5e27234b3b40e8b11484269628e7
diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 3bb27f8..b0d867f 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -37,21 +37,21 @@
// ----------------------------------------------------------------------
// HidlInstrumentor implementation.
-HidlInstrumentor::HidlInstrumentor(
- const std::string &package,
- const std::string &interface)
- : mInstrumentationLibPackage(package), mInterfaceName(interface) {
+HidlInstrumentor::HidlInstrumentor(const std::string& package, const std::string& interface)
+ : mEnableInstrumentation(false),
+ mInstrumentationLibPackage(package),
+ mInterfaceName(interface) {
configureInstrumentation(false);
}
HidlInstrumentor:: ~HidlInstrumentor() {}
void HidlInstrumentor::configureInstrumentation(bool log) {
- bool enable_instrumentation = property_get_bool(
+ bool enableInstrumentation = property_get_bool(
"hal.instrumentation.enable",
false);
- if (enable_instrumentation != mEnableInstrumentation) {
- mEnableInstrumentation = enable_instrumentation;
+ if (enableInstrumentation != mEnableInstrumentation) {
+ mEnableInstrumentation = enableInstrumentation;
if (mEnableInstrumentation) {
if (log) {
LOG(INFO) << "Enable instrumentation.";
@@ -70,11 +70,11 @@
std::vector<InstrumentationCallback> *instrumentationCallbacks) {
#ifdef LIBHIDL_TARGET_DEBUGGABLE
std::vector<std::string> instrumentationLibPaths;
- char instrumentation_lib_path[PROPERTY_VALUE_MAX];
+ char instrumentationLibPath[PROPERTY_VALUE_MAX];
if (property_get("hal.instrumentation.lib.path",
- instrumentation_lib_path,
+ instrumentationLibPath,
"") > 0) {
- instrumentationLibPaths.push_back(instrumentation_lib_path);
+ instrumentationLibPaths.push_back(instrumentationLibPath);
} else {
instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_SYSTEM);
instrumentationLibPaths.push_back(HAL_LIBRARY_PATH_VENDOR);
@@ -103,7 +103,7 @@
dlerror(); /* Clear any existing error */
- using cb_fun = void (*)(
+ using cbFun = void (*)(
const InstrumentationEvent,
const char *,
const char *,
@@ -123,7 +123,7 @@
continue;
}
}
- auto cb = (cb_fun)dlsym(handle, ("HIDL_INSTRUMENTATION_FUNCTION_"
+ auto cb = (cbFun)dlsym(handle, ("HIDL_INSTRUMENTATION_FUNCTION_"
+ package + "_" + mInterfaceName).c_str());
if ((error = dlerror()) != NULL) {
LOG(WARNING)
