diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-10-27 21:33:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-27 21:33:55 +0000 |
| commit | 1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7 (patch) | |
| tree | 7992f5029c08c9b4b3877505c9b0914e1bd59238 /core/java/android/util | |
| parent | 4ec1d430db6c9b564d9b78e3654507594e9dce8c (diff) | |
| parent | 301b563107c7458a21e4460254e81694b45f0e35 (diff) | |
| download | frameworks_base-1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7.zip frameworks_base-1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7.tar.gz frameworks_base-1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7.tar.bz2 | |
am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
automerge: 301b563
* commit '301b563107c7458a21e4460254e81694b45f0e35':
Reduce PackageManager RAM usage: ArrayMap/Set.
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/ArraySet.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/util/ArraySet.java b/core/java/android/util/ArraySet.java index 423e48b..68f725e 100644 --- a/core/java/android/util/ArraySet.java +++ b/core/java/android/util/ArraySet.java @@ -245,13 +245,20 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { /** * Create a new ArraySet with the mappings from the given ArraySet. */ - public ArraySet(ArraySet set) { + public ArraySet(ArraySet<E> set) { this(); if (set != null) { addAll(set); } } + /** {@hide} */ + public ArraySet(Collection<E> set) { + this(); + if (set != null) { + addAll(set); + } + } /** * Make the array map empty. All storage is released. |