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

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

Merge "Properly append META_DATA event on flush"

parents 3603de29 913334e0

sensors/2.0/default/Sensor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ Result Sensor::flush() { 
    // to the Event FMQ prior to writing the flush complete event.

    Event ev;

    ev.sensorHandle = mSensorInfo.sensorHandle;

    ev.sensorType = SensorType::ADDITIONAL_INFO;

    ev.sensorType = SensorType::META_DATA;

    ev.u.meta.what = MetaDataEventType::META_DATA_FLUSH_COMPLETE;

    std::vector<Event> evs{ev};

    mCallback->postEvents(evs, isWakeUpSensor());

sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class EventCallback : public IEventCallback { 
    }



    void onEvent(const ::android::hardware::sensors::V1_0::Event& event) override {

        if (event.sensorType == SensorType::ADDITIONAL_INFO &&

        if (event.sensorType == SensorType::META_DATA &&

            event.u.meta.what == MetaDataEventType::META_DATA_FLUSH_COMPLETE) {

            std::unique_lock<std::recursive_mutex> lock(mFlushMutex);

            mFlushMap[event.sensorHandle]++;