Merge "Decrement size of pending write queue by correct amount" am: 79fc8d0212 am: b492ac69b5 am: 0cf13f7ded

Change-Id: I555d97575c9f4780bc4edcd46ba4cad0b2ff64ef
This commit is contained in:
Automerger Merge Worker
2020-01-17 21:38:00 +00:00

View File

@@ -486,15 +486,14 @@ void HalProxy::handlePendingWrites() {
}
}
lock.lock();
mSizePendingWriteEventsQueue -= numToWrite;
if (pendingWriteEvents.size() > eventQueueSize) {
// TODO(b/143302327): Check if this erase operation is too inefficient. It will copy
// all the events ahead of it down to fill gap off array at front after the erase.
pendingWriteEvents.erase(pendingWriteEvents.begin(),
pendingWriteEvents.begin() + eventQueueSize);
mSizePendingWriteEventsQueue -= eventQueueSize;
} else {
mPendingWriteEventsQueue.pop();
mSizePendingWriteEventsQueue -= pendingWriteEvents.size();
}
}
}