commit 475d4d4d5ecd13ee614009dabf9b1fb6b87dd966
author Brian Stack <bstack@google.com> Fri Oct 19 15:58:09 2018 -0700
committer Brian Stack <bstack@google.com> Wed Oct 24 16:26:27 2018 -0700
tree c5dba9ae696e7ce1d11cd7413dd688362ed6a567
parent 60fcdcf635736cecbadcbbbd26e9858af671bbbe

Default implementation for initialize()

Implements the default initialize() function for Sensors HAL 2.0

Bug: 111070257
Test: Builds
Change-Id: I1d1f0d732d931adaf12ae40167eea484887fb140

sensors/2.0/default/Sensors.h

diff --git a/sensors/2.0/default/Sensors.h b/sensors/2.0/default/Sensors.h
index 1596aa8..15a713a 100644
--- a/sensors/2.0/default/Sensors.h
+++ b/sensors/2.0/default/Sensors.h
@@ -18,9 +18,12 @@
 #define ANDROID_HARDWARE_SENSORS_V2_0_SENSORS_H
 
 #include <android/hardware/sensors/2.0/ISensors.h>
+#include <fmq/MessageQueue.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 
+#include <memory>
+
 namespace android {
 namespace hardware {
 namespace sensors {
@@ -28,10 +31,13 @@
 namespace implementation {
 
 using ::android::sp;
+using ::android::hardware::EventFlag;
 using ::android::hardware::hidl_array;
 using ::android::hardware::hidl_memory;
 using ::android::hardware::hidl_string;
 using ::android::hardware::hidl_vec;
+using ::android::hardware::MessageQueue;
+using ::android::hardware::MQDescriptor;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 
@@ -42,6 +48,9 @@
     using Result = ::android::hardware::sensors::V1_0::Result;
     using SharedMemInfo = ::android::hardware::sensors::V1_0::SharedMemInfo;
 
+    Sensors();
+    virtual ~Sensors();
+
     // Methods from ::android::hardware::sensors::V2_0::ISensors follow.
     Return<void> getSensorsList(getSensorsList_cb _hidl_cb) override;
 
@@ -68,6 +77,35 @@
 
     Return<void> configDirectReport(int32_t sensorHandle, int32_t channelHandle, RateLevel rate,
                                     configDirectReport_cb _hidl_cb) override;
+
+   private:
+    /**
+     * Utility function to delete the Event Flag
+     */
+    void deleteEventFlag();
+
+    using EventMessageQueue = MessageQueue<Event, kSynchronizedReadWrite>;
+    using WakeLockMessageQueue = MessageQueue<uint32_t, kSynchronizedReadWrite>;
+
+    /**
+     * The Event FMQ where sensor events are written
+     */
+    std::unique_ptr<EventMessageQueue> mEventQueue;
+
+    /**
+     * The Wake Lock FMQ that is read to determine when the framework has handled WAKE_UP events
+     */
+    std::unique_ptr<WakeLockMessageQueue> mWakeLockQueue;
+
+    /**
+     * Event Flag to signal to the framework when sensor events are available to be read
+     */
+    EventFlag* mEventQueueFlag;
+
+    /**
+     * Callback for asynchronous events, such as dynamic sensor connections.
+     */
+    sp<ISensorsCallback> mCallback;
 };
 
 }  // namespace implementation