Modify SensorDevice to use ISensorsWrapper
Modify the SensorDevice to the use the ISensorsWrapper to abstract
away the version of the currently loaded HAL.
Bug: 111070257
Test: Verified sensor events were received via a_sns_test
Change-Id: I373e6ff2cfe1ea5167b9144e523729b9b0c46fac
diff --git a/services/sensorservice/SensorDevice.h b/services/sensorservice/SensorDevice.h
index 6d75051..595a627 100644
--- a/services/sensorservice/SensorDevice.h
+++ b/services/sensorservice/SensorDevice.h
@@ -19,6 +19,7 @@
#include "SensorDeviceUtils.h"
#include "SensorServiceUtils.h"
+#include "SensorsWrapper.h"
#include <sensor/Sensor.h>
#include <stdint.h>
@@ -31,8 +32,6 @@
#include <unordered_map>
#include <algorithm> //std::max std::min
-#include "android/hardware/sensors/1.0/ISensors.h"
-
#include "RingBuffer.h"
// ---------------------------------------------------------------------------
@@ -103,7 +102,7 @@
private:
friend class Singleton<SensorDevice>;
- sp<hardware::sensors::V1_0::ISensors> mSensors;
+ sp<SensorServiceUtil::ISensorsWrapper> mSensors;
Vector<sensor_t> mSensorList;
std::unordered_map<int32_t, sensor_t*> mConnectedDynamicSensors;
@@ -163,6 +162,8 @@
SortedVector<void *> mDisabledClients;
SensorDevice();
bool connectHidlService();
+ bool connectHidlServiceV1_0();
+ bool connectHidlServiceV2_0();
static void handleHidlDeath(const std::string &detail);
template<typename T>