diff options
author | Narayan Kamath <narayan@google.com> | 2014-07-01 16:52:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-01 16:52:37 +0000 |
commit | 75e74175182241553d35d593691064fbefddf516 (patch) | |
tree | 9b68f1d0ab239501f209cc3af498b833f6e5e116 | |
parent | 095e5569717ecaa8e430c22ffd8afb68d1154821 (diff) | |
parent | a92e8e0fa83ff37f7802bb1faef25275733facbd (diff) | |
download | libcore-75e74175182241553d35d593691064fbefddf516.zip libcore-75e74175182241553d35d593691064fbefddf516.tar.gz libcore-75e74175182241553d35d593691064fbefddf516.tar.bz2 |
am a92e8e0f: am ed3ee85f: Merge "Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter.""
* commit 'a92e8e0fa83ff37f7802bb1faef25275733facbd':
Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."
-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 7f1b0be..3b477d0 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 ArrayAdapter<E> extends AbstractList<E> implements + private static class ArrayList<E> extends AbstractList<E> implements List<E>, Serializable, RandomAccess { private static final long serialVersionUID = -2764017481108945198L; private final E[] a; - ArrayAdapter(E[] storage) { + ArrayList(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 ArrayAdapter<T>(array); + return new ArrayList<T>(array); } /** |