commit 7e4eb72ad883b5182130a31962d23b5afdf1c261
author Jason Simmons <jsimmons@google.com> Thu Oct 25 18:08:03 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 25 18:08:03 2012 -0700
tree 076e5023f811a5b219fe6179a1e9f5dd04fedd1c
parent e8966b349f5f527bf17d2cd6c85eb5ec42d9cab6
parent 40cd45151513ecc02c95e0cc1b40480dd816cdd4

am 40cd4515: am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev

* commit '40cd45151513ecc02c95e0cc1b40480dd816cdd4':
  Ensure that Vector::erase() returns a valid iterator

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: