summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-06-16 17:18:52 -0700
committerCraig Mautner <cmautner@google.com>2014-06-17 17:22:58 -0700
commit43e52ed32e2d55ef4aee18c4b4bc13b7fdef9cc4 (patch)
treeee2802fac76c40e9d31311fea66366bdc5d208d4 /core/java/android/app/ActivityThread.java
parent5d140e4b1b1d43c742a7d67dd5f9d394c846945f (diff)
downloadframeworks_base-43e52ed32e2d55ef4aee18c4b4bc13b7fdef9cc4.zip
frameworks_base-43e52ed32e2d55ef4aee18c4b4bc13b7fdef9cc4.tar.gz
frameworks_base-43e52ed32e2d55ef4aee18c4b4bc13b7fdef9cc4.tar.bz2
Fix persistent tasks and expand scope
- Fixed missing tag closure on the xml for storing Intent categories. - Shortened timeout for flushing tasks to persistent storage from one minute to ten seconds. - Made persistency the default except for those tasks on the home stack and those tasks that exclude themselves from the recent task list. - Fixed deletion of tasks after restoring. Tasks now survive a second reboot, not just the first reboot. - Fixed sort order so most recent tasks will be restored at front. Fixes bug 15672002. Change-Id: I16d87d58c6fd2e879cfd0c0b18b2694432a79b71
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index ea46044..00cdbd0 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -317,7 +317,7 @@ public final class ActivityThread {
}
public boolean isPersistable() {
- return (activityInfo.flags & ActivityInfo.FLAG_PERSISTABLE) != 0;
+ return activityInfo.persistableMode == ActivityInfo.PERSIST_ACROSS_REBOOTS;
}
public String toString() {