diff options
author | Craig Mautner <cmautner@google.com> | 2014-04-23 11:45:37 -0700 |
---|---|---|
committer | Craig Mautner <cmautner@google.com> | 2014-05-23 18:42:33 -0700 |
commit | 21d24a21ea4aaadd78e73de54168e8a8a8973e4d (patch) | |
tree | a06ea1745dfedcf8b118cee132c02a8b60cec6d1 /core/java/android/os/CommonBundle.java | |
parent | cd3a8245489fa36c528b075efe99a147cf4f6785 (diff) | |
download | frameworks_base-21d24a21ea4aaadd78e73de54168e8a8a8973e4d.zip frameworks_base-21d24a21ea4aaadd78e73de54168e8a8a8973e4d.tar.gz frameworks_base-21d24a21ea4aaadd78e73de54168e8a8a8973e4d.tar.bz2 |
Add code for persisting tasks and activities to disk DO NOT MERGE
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.
Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
Diffstat (limited to 'core/java/android/os/CommonBundle.java')
-rw-r--r-- | core/java/android/os/CommonBundle.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/os/CommonBundle.java b/core/java/android/os/CommonBundle.java index e11f170..c1b202c 100644 --- a/core/java/android/os/CommonBundle.java +++ b/core/java/android/os/CommonBundle.java @@ -18,11 +18,10 @@ package android.os; import android.util.ArrayMap; import android.util.Log; -import android.util.SparseArray; import java.io.Serializable; import java.util.ArrayList; -import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -304,6 +303,16 @@ abstract class CommonBundle implements Parcelable, Cloneable { } /** + * Inserts all mappings from the given Map into this CommonBundle. + * + * @param map a Map + */ + void putAll(Map map) { + unparcel(); + mMap.putAll(map); + } + + /** * Returns a Set containing the Strings used as keys in this Bundle. * * @return a Set of String keys |