summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-07-01 16:47:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-01 16:47:42 +0000
commita92e8e0fa83ff37f7802bb1faef25275733facbd (patch)
tree675d3d445cc09335f6b2e04772edcd25a94f0bd1 /luni
parent7cdc504277a4d182bde24f3f04ce938bf0c0ea50 (diff)
parented3ee85f37dbe2fc4517cc296dd4a59edac558bc (diff)
downloadlibcore-a92e8e0fa83ff37f7802bb1faef25275733facbd.zip
libcore-a92e8e0fa83ff37f7802bb1faef25275733facbd.tar.gz
libcore-a92e8e0fa83ff37f7802bb1faef25275733facbd.tar.bz2
am ed3ee85f: Merge "Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter.""
* commit 'ed3ee85f37dbe2fc4517cc296dd4a59edac558bc': Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."
Diffstat (limited to 'luni')
-rw-r--r--luni/src/main/java/java/util/Arrays.java6
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);
}
/**