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

Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev

Browse Source
This commit is contained in:
Winson Chung
2014-08-21 17:19:27 +00:00
committed by Android (Google) Code Review
parent 6a12e77194 3bad5cc0f5
commit b91bd653c9
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -1054,8 +1054,8 @@ final class ActivityRecord {
return null;
}
private static String createImageFilename(ActivityRecord r, int taskId) {
return String.valueOf(taskId) + ACTIVITY_ICON_SUFFIX + r.createTime +
private static String createImageFilename(long createTime, int taskId) {
return String.valueOf(taskId) + ACTIVITY_ICON_SUFFIX + createTime +
TaskPersister.IMAGE_EXTENSION;
}
@@ -1072,7 +1072,7 @@ final class ActivityRecord {
out.attribute(null, ATTR_USERID, String.valueOf(userId));
if (taskDescription != null) {
task.saveTaskDescription(taskDescription, createImageFilename(this, task.taskId),
task.saveTaskDescription(taskDescription, createImageFilename(createTime, task.taskId),
out);
}
@@ -1165,7 +1165,8 @@ final class ActivityRecord {
r.persistentState = persistentState;
if (createTime >= 0) {
taskDescription.setIcon(TaskPersister.restoreImage(createImageFilename(r, taskId)));
taskDescription.setIcon(TaskPersister.restoreImage(createImageFilename(createTime,
taskId)));
}
r.taskDescription = taskDescription;
r.createTime = createTime;

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

@@ -792,6 +792,11 @@ final class TaskRecord {
return true;
}
private static String createLastTaskDescriptionIconFilename(int taskId, long lastActiveTime) {
return String.valueOf(taskId) + LAST_ACTIVITY_ICON_SUFFIX + lastActiveTime +
TaskPersister.IMAGE_EXTENSION;
}
void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException {
if (ActivityManagerService.DEBUG_RECENTS) Slog.i(TAG, "Saving task=" + this);
@@ -818,8 +823,8 @@ final class TaskRecord {
out.attribute(null, ATTR_LASTDESCRIPTION, lastDescription.toString());
}
if (lastTaskDescription != null) {
saveTaskDescription(lastTaskDescription, String.valueOf(taskId) +
LAST_ACTIVITY_ICON_SUFFIX + lastActiveTime, out);
saveTaskDescription(lastTaskDescription, createLastTaskDescriptionIconFilename(taskId,
lastActiveTime), out);
}
out.attribute(null, ATTR_TASK_AFFILIATION_COLOR, String.valueOf(mAffiliatedTaskColor));
out.attribute(null, ATTR_TASK_AFFILIATION, String.valueOf(mAffiliatedTaskId));
@@ -961,8 +966,8 @@ final class TaskRecord {
}
if (lastActiveTime >= 0) {
taskDescription.setIcon(TaskPersister.restoreImage(String.valueOf(taskId) +
LAST_ACTIVITY_ICON_SUFFIX + lastActiveTime + TaskPersister.IMAGE_EXTENSION));
taskDescription.setIcon(TaskPersister.restoreImage(
createLastTaskDescriptionIconFilename(taskId, lastActiveTime)));
}
final TaskRecord task = new TaskRecord(stackSupervisor.mService, taskId, intent,