diff options
author | Narayan Kamath <narayan@google.com> | 2014-07-01 12:54:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-01 12:54:20 +0000 |
commit | 095e5569717ecaa8e430c22ffd8afb68d1154821 (patch) | |
tree | 6abec20bf3c5ef7cbc18a3cf9722141ec742aef0 /luni | |
parent | 738c833d38d41f8f76eb7e77ab39add82b1ae1e2 (diff) | |
parent | 7cdc504277a4d182bde24f3f04ce938bf0c0ea50 (diff) | |
download | libcore-095e5569717ecaa8e430c22ffd8afb68d1154821.zip libcore-095e5569717ecaa8e430c22ffd8afb68d1154821.tar.gz libcore-095e5569717ecaa8e430c22ffd8afb68d1154821.tar.bz2 |
am 7cdc5042: am f9a56a30: Merge "Rename Arrays.ArrayList to Arrays.ArrayAdapter."
* commit '7cdc504277a4d182bde24f3f04ce938bf0c0ea50':
Rename Arrays.ArrayList to Arrays.ArrayAdapter.
Diffstat (limited to 'luni')
-rw-r--r-- | luni/src/main/java/java/util/Arrays.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/luni/src/main/java/java/util/Arrays.java b/luni/src/main/java/java/util/Arrays.java index 3b477d0..7f1b0be 100644 --- a/luni/src/main/java/java/util/Arrays.java +++ b/luni/src/main/java/java/util/Arrays.java @@ -26,14 +26,14 @@ import java.lang.reflect.Array; * @since 1.2 */ public class Arrays { - private static class ArrayList<E> extends AbstractList<E> implements + private static class ArrayAdapter<E> extends AbstractList<E> implements List<E>, Serializable, RandomAccess { private static final long serialVersionUID = -2764017481108945198L; private final E[] a; - ArrayList(E[] storage) { + ArrayAdapter(E[] storage) { if (storage == null) { throw new NullPointerException("storage == null"); } @@ -152,7 +152,7 @@ public class Arrays { */ @SafeVarargs public static <T> List<T> asList(T... array) { - return new ArrayList<T>(array); + return new ArrayAdapter<T>(array); } /** |