am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd8e8e66220cd71486a3b545096a1cdc298dee5fd':
partially implement external display clipping
Always set vertex alpha when drawing screenshot layers
SurfaceFlinger: add animation transactions
ugly, temporary, workaroung for a problem where a binder thread spins forever
make sure we don't call into the HWC HAL when not needed
Fix crashes after HDMI disconnect
Fix issue #7271589: Cannot set Ocean HD live wallpaper
Revert "Compatibility work around for bad graphics driver dependency."
only abort when errors happen on the main display
Check that HWC exists before trying to use it
Always reset layer acquireFenceFd after commit
fix a problem where all hwc layers would have the SKIP flags set
we were sometimes not setting fences properly
A vendor ril depends on a native screen shot code.
Revert "Added display initialization method"
fix various issues in SF's EventThread
Revert "SurfaceTexture: inherit from ConsumerBase"
we were mistakenly optimizing out SF's main transactions in some cases
Revert "Minimal changes to support multi-display HWC"
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: