diff options
| author | Erik Staats <estaats@google.com> | 2021-09-24 05:48:24 -0700 |
|---|---|---|
| committer | Erik Staats <estaats@google.com> | 2021-09-24 06:16:51 -0700 |
| commit | 3c7a12d8f1764df734f74b486e57acf1f629dd5e (patch) | |
| tree | e71c14d8d618bc471344ff3430d42e281b769a16 /modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h | |
| parent | 1d509cf815c5e3319ce4303eabe863b6b8dcf3a1 (diff) | |
dynamic_sensor: Add sensor manager init to sub-HAL 2.1.
Bug: 195964858
Test: Verified dynamic sensor manager is present in sensor list and that
no SELinux violations occur on sc-v2-dev and master.
$ make -j28 && \
vendor/google/tools/flashall -w -s 14281FDEE000A5 --disable_verity && \
sleep 90 && adb root
.
.
.
$ adb shell sensor_test list | grep "sensor_test\|Type\|Dynamic"
sensor_test version 74
Type Subtype Name
32 0 Dynamic Sensor Manager
$ adb logcat -d | grep avc | grep sensor
$
Change-Id: Ib3da287e4f4118ad6b19498248e263f8c1662b3a
Diffstat (limited to 'modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h')
| -rw-r--r-- | modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h b/modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h index 36ed9f5a..ab5d2999 100644 --- a/modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h +++ b/modules/sensors/dynamic_sensor/DynamicSensorsSubHal.h @@ -17,6 +17,8 @@ #ifndef ANDROID_SENSORHAL_EXT_DYNAMIC_SENSORS_SUB_HAL_H #define ANDROID_SENSORHAL_EXT_DYNAMIC_SENSORS_SUB_HAL_H +#include "DynamicSensorManager.h" + #include <V2_1/SubHal.h> namespace android { @@ -37,6 +39,8 @@ class DynamicSensorsSubHal : using SharedMemInfo = ::android::hardware::sensors::V1_0::SharedMemInfo; public: + DynamicSensorsSubHal(); + // ISensors. Return<Result> setOperationMode(OperationMode mode) override; Return<Result> activate(int32_t sensor_handle, bool enabled) override; @@ -60,6 +64,14 @@ public: const std::string getName() override { return "Dynamic-SubHAL"; } Return<Result> initialize( const sp<IHalProxyCallback>& hal_proxy_callback) override; + +private: + static constexpr int32_t kDynamicHandleBase = 0; + static constexpr int32_t kDynamicHandleEnd = 0x1000000; + static constexpr int32_t kMaxDynamicHandleCount = kDynamicHandleEnd - + kDynamicHandleBase; + + std::unique_ptr<DynamicSensorManager> mDynamicSensorManager; }; } // namespace SensorHalExt |