summaryrefslogtreecommitdiffstats
path: root/libs/utils/VectorImpl.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-06-13 17:55:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-13 17:55:28 -0700
commit39a128a857e70ffeeb068e96b88c50c153e22979 (patch)
treec5e5d1126fb0e65a4d054c9411484eff23cb943c /libs/utils/VectorImpl.cpp
parent1b02178d16da6817d509e70107a9e0364f058236 (diff)
parente839a589bf582568cf220c1040ed93b948e6e362 (diff)
downloadframeworks_native-39a128a857e70ffeeb068e96b88c50c153e22979.zip
frameworks_native-39a128a857e70ffeeb068e96b88c50c153e22979.tar.gz
frameworks_native-39a128a857e70ffeeb068e96b88c50c153e22979.tar.bz2
am 46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread * commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2': Native input dispatch rewrite work in progress.
Diffstat (limited to 'libs/utils/VectorImpl.cpp')
-rw-r--r--libs/utils/VectorImpl.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/libs/utils/VectorImpl.cpp b/libs/utils/VectorImpl.cpp
index 0322af7..b09c6ca 100644
--- a/libs/utils/VectorImpl.cpp
+++ b/libs/utils/VectorImpl.cpp
@@ -108,13 +108,7 @@ size_t VectorImpl::capacity() const
ssize_t VectorImpl::insertVectorAt(const VectorImpl& vector, size_t index)
{
- if (index > size())
- return BAD_INDEX;
- void* where = _grow(index, vector.size());
- if (where) {
- _do_copy(where, vector.arrayImpl(), vector.size());
- }
- return where ? index : (ssize_t)NO_MEMORY;
+ return insertAt(vector.arrayImpl(), index, vector.size());
}
ssize_t VectorImpl::appendVector(const VectorImpl& vector)
@@ -226,9 +220,9 @@ ssize_t VectorImpl::add()
return add(0);
}
-ssize_t VectorImpl::add(const void* item)
+ssize_t VectorImpl::add(const void* item, size_t numItems)
{
- return insertAt(item, size());
+ return insertAt(item, size(), numItems);
}
ssize_t VectorImpl::replaceAt(size_t index)