commit 979887bc9b77c6e2b1835e5ff8541579a88d2552
author Brian Stack <bstack@google.com> Wed Sep 19 15:27:48 2018 -0700
committer Brian Stack <bstack@google.com> Mon Sep 24 15:48:47 2018 -0700
tree 45557c7c95ac04a0404037d3e5511cec6561d490
parent c90c13c03ea2d316c8744de7b522de9b818a9b31

Initialize SensorDevice's FMQs

Initialize the SensorDevice's FMQs that are used to transport data
between the SensorDevice and Sensors HAL.

Bug: 111070257
Test: Compiles
Change-Id: I4f0d710a43f2d22227f8f2fa6af19d87d53b5021

services/sensorservice/SensorDevice.h

diff --git a/services/sensorservice/SensorDevice.h b/services/sensorservice/SensorDevice.h
index 595a627..1b2d908 100644
--- a/services/sensorservice/SensorDevice.h
+++ b/services/sensorservice/SensorDevice.h
@@ -21,6 +21,7 @@
 #include "SensorServiceUtils.h"
 #include "SensorsWrapper.h"
 
+#include <fmq/MessageQueue.h>
 #include <sensor/Sensor.h>
 #include <stdint.h>
 #include <sys/types.h>
@@ -162,8 +163,15 @@
     SortedVector<void *> mDisabledClients;
     SensorDevice();
     bool connectHidlService();
-    bool connectHidlServiceV1_0();
-    bool connectHidlServiceV2_0();
+
+    enum HalConnectionStatus {
+        CONNECTED, // Successfully connected to the HAL
+        DOES_NOT_EXIST, // Could not find the HAL
+        FAILED_TO_CONNECT, // Found the HAL but failed to connect/initialize
+        UNKNOWN,
+    };
+    HalConnectionStatus connectHidlServiceV1_0();
+    HalConnectionStatus connectHidlServiceV2_0();
 
     static void handleHidlDeath(const std::string &detail);
     template<typename T>
@@ -190,6 +198,11 @@
             sensors_event_t *dst);
 
     bool mIsDirectReportSupported;
+
+    typedef hardware::MessageQueue<Event, hardware::kSynchronizedReadWrite> EventMessageQueue;
+    typedef hardware::MessageQueue<uint32_t, hardware::kSynchronizedReadWrite> WakeLockQueue;
+    std::unique_ptr<EventMessageQueue> mEventQueue;
+    std::unique_ptr<WakeLockQueue> mWakeLockQueue;
 };
 
 // ---------------------------------------------------------------------------