Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2014-10-22 15:43:52 +00:00
committed by Android (Google) Code Review
parent 733bb3bc78 be23ff4949
commit f7fb3acf8f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/TaskPersister.java
View File

@@ -166,7 +166,7 @@ public class TaskPersister {
break;
}
}
if (queueNdx < 0) {
if (queueNdx < 0 && task.isPersistable) {
mWriteQueue.add(new TaskWriteQueueItem(task));
}
} else {
@@ -473,13 +473,15 @@ public class TaskPersister {
if (DEBUG) Slog.d(TAG, "mRecents=" + tasks);
for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = tasks.get(taskNdx);
if (DEBUG) Slog.d(TAG, "LazyTaskWriter: task=" + task + " persistable=" +
task.isPersistable);
if (task.isPersistable && !task.stack.isHomeStack()) {
if (DEBUG) Slog.d(TAG, "LazyTaskWriter: task=" + task +
" persistable=" + task.isPersistable);
if ((task.isPersistable || task.inRecents)
&& !task.stack.isHomeStack()) {
if (DEBUG) Slog.d(TAG, "adding to persistentTaskIds task=" + task);
persistentTaskIds.add(task.taskId);
} else {
if (DEBUG) Slog.d(TAG, "omitting from persistentTaskIds task=" + task);
if (DEBUG) Slog.d(TAG,
"omitting from persistentTaskIds task=" + task);
}
}
}

2
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -144,7 +144,7 @@ final class TaskRecord {
boolean mReuseTask = false;
private Bitmap mLastThumbnail; // Last thumbnail captured for this item.
private final File mLastThumbnailFile; // File containing last thubmnail.
private final File mLastThumbnailFile; // File containing last thumbnail.
private final String mFilename;
CharSequence lastDescription; // Last description captured for this item.