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

Commit f0eff80a authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev 

am: 8669acc9

Change-Id: I5fa61c3ffa5f41a5093dba86ad255687d29466b4
parents 3abd8faa 8669acc9

services/sensorservice/SensorEventConnection.cpp

+8 −1
Original line number Diff line number Diff line
@@ -477,7 +477,14 @@ void SensorService::SensorEventConnection::countFlushCompleteEventsLocked( 
    // separately before the next batch of events.

    for (int j = 0; j < numEventsDropped; ++j) {

        if (scratch[j].type == SENSOR_TYPE_META_DATA) {

            FlushInfo& flushInfo = mSensorInfo.editValueFor(scratch[j].meta_data.sensor);

            ssize_t index = mSensorInfo.indexOfKey(scratch[j].meta_data.sensor);

            if (index < 0) {

                ALOGW("%s: sensor 0x%x is not found in connection",

                      __func__, scratch[j].meta_data.sensor);

                continue;

            }



            FlushInfo& flushInfo = mSensorInfo.editValueAt(index);

            flushInfo.mPendingFlushEventsToSend++;

            ALOGD_IF(DEBUG_CONNECTIONS, "increment pendingFlushCount %d",

                     flushInfo.mPendingFlushEventsToSend);