Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev (f7fb3acf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/TaskPersister.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.