diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
| commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
| tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java | |
| parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
| parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
| download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip | |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java')
| -rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java b/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java index 6c30ab9..20c9db9 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java +++ b/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java @@ -16,8 +16,6 @@ package com.google.common.collect.testing; -import com.google.common.annotations.GwtCompatible; - import java.util.AbstractCollection; import java.util.Arrays; import java.util.Collection; @@ -29,7 +27,6 @@ import java.util.Iterator; * * @author Kevin Bourrillion */ -@GwtCompatible public class MinimalCollection<E> extends AbstractCollection<E> { // TODO: expose allow nulls parameter? @@ -96,7 +93,7 @@ public class MinimalCollection<E> extends AbstractCollection<E> { @Override public Object[] toArray() { Object[] result = new Object[contents.length]; - System.arraycopy(contents, 0, result, 0, contents.length); + Platform.unsafeArrayCopy(contents, 0, result, 0, contents.length); return result; } |