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

Commit e91b8563 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Decrement size of pending write queue by correct amount" am: 79fc8d02...

Merge "Decrement size of pending write queue by correct amount" am: 79fc8d02 am: b492ac69 am: 0cf13f7d

Change-Id: I555d97575c9f4780bc4edcd46ba4cad0b2ff64ef
parents a814592e 0cf13f7d
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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();
            }
        }
    }