commit d4e706208c99ff1716fb0009ec867ff29ff04a7c
author Jamie Gennis <jgennis@google.com> Fri Dec 07 11:04:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 07 11:04:51 2012 -0800
tree f0d1b201b52ead22b6e1791d5ed375f6357cb9a1
parent 2d659286b59dc7ff7378fe967f1c425e92155995
parent 72c3f7d88160b7c279f90f0efe3c1cb12cd140ae

am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"

* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
  Revert "ConsumerBase: free buffers outside the lock"

include/utils/Vector.h

diff --git a/include/utils/Vector.h b/include/utils/Vector.h
index 7927328..f3020d6 100644
--- a/include/utils/Vector.h
+++ b/include/utils/Vector.h
@@ -188,7 +188,8 @@
      inline void push_back(const TYPE& item)  { insertAt(item, size(), 1); }
      inline void push_front(const TYPE& item) { insertAt(item, 0, 1); }
      inline iterator erase(iterator pos) {
-         return begin() + removeItemsAt(pos-array());
+         ssize_t index = removeItemsAt(pos-array());
+         return begin() + index;
      }
 
 protected: