Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a354a0a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Initialize callback for Sensors HAL 2.0 VTS tests"

parents c39df093 54a73b63
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@

using ::android::hardware::EventFlag;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::sensors::V1_0::Result;
using ::android::hardware::sensors::V1_0::SensorInfo;
using ::android::hardware::sensors::V2_0::EventQueueFlagBits;
using ::android::hardware::sensors::V2_0::ISensors;
using ::android::hardware::sensors::V2_0::ISensorsCallback;

template <typename EnumType>
constexpr typename std::underlying_type<EnumType>::type asBaseType(EnumType value) {
@@ -36,6 +38,16 @@ constexpr typename std::underlying_type<EnumType>::type asBaseType(EnumType valu

constexpr size_t SensorsHidlEnvironmentV2_0::MAX_RECEIVE_BUFFER_EVENT_COUNT;

struct SensorsCallback : ISensorsCallback {
    Return<void> onDynamicSensorsConnected(const hidl_vec<SensorInfo>& /* sensorInfos */) {
        return Return<void>();
    }

    Return<void> onDynamicSensorsDisconnected(const hidl_vec<int32_t>& /* sensorHandles */) {
        return Return<void>();
    }
};

bool SensorsHidlEnvironmentV2_0::resetHal() {
    bool succeed = false;
    do {
@@ -63,7 +75,7 @@ bool SensorsHidlEnvironmentV2_0::resetHal() {
        }

        mSensors->initialize(*mEventQueue->getDesc(), *mWakeLockQueue->getDesc(),
                             nullptr /* TODO: callback */);
                             new SensorsCallback());

        std::vector<SensorInfo> sensorList;
        if (!mSensors->getSensorsList([&](const hidl_vec<SensorInfo>& list) { sensorList = list; })