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

Change-Id: I4c49229efbcfeeaaa2e4e7299dbac230f2ae9caf

sensors/2.0/multihal/HalProxy.cpp

@@ -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();
             }
         }
     }