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

Commit 63fbab89 authored by Peng Xu's avatar Peng Xu
Browse files

Check key before edit value in countFlushCompleteEventsLocked 

Fix an unchecked editValueFor that potentially causes log fatal
when sensor is removed from connection shortly before arrival of
flush complete message.

Bug: 62806749
Test: compiles, flush() still working.
Change-Id: I3684251b7bb746b01d0d8849024217c80ad52f9d
parent 5cf813ee

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);