commit 4617ff619c60bebf3aae8f9b4a621ec3f1f36feb
author Steven Moreland <smoreland@google.com> Wed Aug 09 20:58:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 20:58:39 2017 +0000
tree d0341ef20fb6e448da805557536fc81a6990062b
parent d0329fe6202636eeae7d35d2ed055c9a805ba89d
parent 1ba6751d20c1dd88339ba40459c13c4270d827fe

Merge "Expose HidlInstrumentor data."
am: 1ba6751d20

Change-Id: Ied57cd2e11e84facf4999ef957724b6d8e825ea2

base/include/hidl/HidlInternal.h

diff --git a/base/include/hidl/HidlInternal.h b/base/include/hidl/HidlInternal.h
index d81dd9c..2a86c9e 100644
--- a/base/include/hidl/HidlInternal.h
+++ b/base/include/hidl/HidlInternal.h
@@ -156,7 +156,13 @@
             const std::string &insterface);
     virtual ~HidlInstrumentor();
 
- protected:
+   public:
+    const std::vector<InstrumentationCallback>& getInstrumentationCallbacks() {
+        return mInstrumentationCallbacks;
+    }
+    bool isInstrumentationEnabled() { return mEnableInstrumentation; }
+
+   protected:
     // Set mEnableInstrumentation based on system property
     // hal.instrumentation.enable, register/de-register instrumentation
     // callbacks if mEnableInstrumentation is true/false.