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

Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev

Browse Source
This commit is contained in:
Winson Chung
2017-01-26 22:17:08 +00:00
committed by Android (Google) Code Review
parent c399e4d964 452ff6db94
commit c52a3cb704
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1384,7 +1384,8 @@ final class ActivityRecord {
if (_taskDescription.getIconFilename() == null && if (_taskDescription.getIconFilename() == null &&
(icon = _taskDescription.getIcon()) != null) { (icon = _taskDescription.getIcon()) != null) {
final String iconFilename = createImageFilename(createTime, task.taskId); final String iconFilename = createImageFilename(createTime, task.taskId);
final File iconFile = new File(TaskPersister.getUserImagesDir(userId), iconFilename); final File iconFile = new File(TaskPersister.getUserImagesDir(task.userId),
iconFilename);
final String iconFilePath = iconFile.getAbsolutePath(); final String iconFilePath = iconFile.getAbsolutePath();
service.mRecentTasks.saveImage(icon, iconFilePath); service.mRecentTasks.saveImage(icon, iconFilePath);
_taskDescription.setIconFilename(iconFilePath); _taskDescription.setIconFilename(iconFilePath);