Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5addd9b2 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

resolve merge conflicts of 931f1360 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I598c17e0d9428fc3eda24f63cba2aeb57986caf0
parents 21689ed8 931f1360

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ class RecentTasks extends ArrayList<TaskRecord> { 
        mUsersWithRecentsLoaded.put(userId, true);



        // If we have tasks added before loading recents, we need to update persistent task IDs.

        if (preaddedTasks.size() != 0) {

        if (preaddedTasks.size() > 0) {

            syncPersistentTaskIdsLocked();

        }

    }

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

+5 −3
Original line number Diff line number Diff line
@@ -435,13 +435,15 @@ public class TaskPersister { 
            }

            try {

                final int taskId = Integer.parseInt(taskFile.getName().substring(

                        0, taskFile.getName().length() - TASK_FILENAME_SUFFIX.length()));

                        0 /* beginIndex */,

                        taskFile.getName().length() - TASK_FILENAME_SUFFIX.length()));

                if (preaddedTasks.get(taskId, false)) {

                    Slog.w(TAG, "Task #" + taskId + " has already been created so we don't restore"

                            + " again");

                    Slog.w(TAG, "Task #" + taskId +

                            " has already been created so we don't restore again");

                    continue;

                }

            } catch (NumberFormatException e) {

                Slog.w(TAG, "Unexpected task file name", e);

                continue;

            }