summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-10-28 07:16:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 07:16:25 +0000
commit23801ccafb4ac12581b090bc7838350b169feb8a (patch)
tree3ed1b5ab2c57f8ec504e854bdf7cc4b6e85d1776 /core/java/android/util
parent972c42e34a3470ed04ad34c9f347f196d865b2f9 (diff)
parent1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7 (diff)
downloadframeworks_base-23801ccafb4ac12581b090bc7838350b169feb8a.zip
frameworks_base-23801ccafb4ac12581b090bc7838350b169feb8a.tar.gz
frameworks_base-23801ccafb4ac12581b090bc7838350b169feb8a.tar.bz2
am 1c665948: am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev automerge: 301b563
* commit '1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7': Reduce PackageManager RAM usage: ArrayMap/Set.
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/ArraySet.java9
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.