Sensor: Invensense: 6515: fix step counter corrupting event queueandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-dev

Fixed a sensor event queue corruption bug caused in some cases
when a step event is read.  The bug would either cause the step
event to get overwritten before being delivered to Sensor Services,
resulting in a lost sensor event and an older, already sent sensor
event to be resent to sensor services.

Bug: 25618874
Change-Id: I9d4c87b42f88113275a8ac613ae87ae9ec20d6ea

1 files changed, 4 insertions, 0 deletions

diff --git a/6515/libsensors_iio/MPLSensor.cpp b/6515/libsensors_iio/MPLSensor.cpp
index bf0fdb9..5a57d0b 100644
--- a/6515/libsensors_iio/MPLSensor.cpp
+++ b/6515/libsensors_iio/MPLSensor.cpp
@@ -3902,6 +3902,7 @@ int MPLSensor::readEvents(sensors_event_t* data, int count)
                             count--;
                             numEventReceived++;
                             data->timestamp = mStepSensorTimestamp;
+                            data++;
                             mLastTimestamp[i] = mStepSensorTimestamp;
                         } else {
                             ALOGE("Event from type=%d with duplicate timestamp %lld discarded",
@@ -4565,6 +4566,9 @@ LOGV_IF(INPUT_DATA,
                 LOGV_IF(INPUT_DATA,
                     "HAL:input build step: 1 - %lld", mStepSensorTimestamp);
             } else {
+                LOGV_IF(ENG_VERBOSE, "Step data OUT OF ORDER, "
+                        "mPedUpdate = 0x%x last = %lld, ts = %lld",
+                        mPedUpdate, mStepSensorTimestamp, latestTimestamp);
                 mPedUpdate = 0;
             }
         }