commit 8af04d8b85183978aa6182c281325394bf47a593
author Alan Viverette <alanv@google.com> Mon Dec 02 21:20:06 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 02 21:20:07 2013 +0000
tree eae11eb49f02f5d8e0e8bdea1ac0049ddfd65f57
parent d786a1900e94c4f0c919b50b44667cea32fd2939
parent db24d142f5202c79128d98cd031be8c34c0731f7

Merge "Fix LongArray.addAll() to use correct arraycopy argument order"

core/java/android/util/LongArray.java

diff --git a/core/java/android/util/LongArray.java b/core/java/android/util/LongArray.java
index 7d42063..290a89b 100644
--- a/core/java/android/util/LongArray.java
+++ b/core/java/android/util/LongArray.java
@@ -83,7 +83,7 @@
         final int count = values.mSize;
         ensureCapacity(count);
 
-        System.arraycopy(mValues, mSize, values.mValues, 0, count);
+        System.arraycopy(values.mValues, 0, mValues, mSize, count);
         mSize += count;
     }
 
@@ -127,6 +127,9 @@
      * Returns the value at the specified position in this array.
      */
     public long get(int index) {
+        if (index >= mSize) {
+            throw new ArrayIndexOutOfBoundsException(mSize, index);
+        }
         return mValues[index];
     }
 
@@ -148,6 +151,9 @@
      * Removes the value at the specified index from this array.
      */
     public void remove(int index) {
+        if (index >= mSize) {
+            throw new ArrayIndexOutOfBoundsException(mSize, index);
+        }
         System.arraycopy(mValues, index, mValues, index + 1, mSize - index);
     }