commit c4b46dd12d3f8846c52203a2d484a950edfa3014
author Fyodor Kupolov <fkupolov@google.com> Thu Mar 17 12:57:36 2016 -0700
committer Fyodor Kupolov <fkupolov@google.com> Thu Mar 17 22:29:23 2016 +0000
tree 5bb3956433a11eee9c1fe911ed3e55bcdddab25e
parent 943c68ae0683c602ef704aa0c0270b93ec8b4154

Prevent NPE when syncing recent tasks

Temporary fix to unblock GTS tests for ryu.

Bug: 27686987
Change-Id: Id9398cd8615bf90aecf02051f26db10f39d598b0

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

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index 7209814..91f2aa8 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -116,6 +116,7 @@
         // on file when we loaded them.
         if (mPersistedTaskIds.get(userId) == null) {
             mPersistedTaskIds.put(userId, mTaskPersister.loadPersistedTaskIdsForUser(userId));
+            Slog.i(TAG, "Loaded persisted task ids for user " + userId);
         }
     }
 
@@ -146,6 +147,12 @@
             TaskRecord task = get(i);
             if (task.isPersistable && (task.stack == null || !task.stack.isHomeStack())) {
                 // Set of persisted taskIds for task.userId should not be null here
+                // TODO Investigate why it can happen. For now initialize with an empty set
+                if (mPersistedTaskIds.get(task.userId) == null) {
+                    Slog.wtf(TAG, "No task ids found for userId " + task.userId + ". task=" + task
+                            + " mPersistedTaskIds=" + mPersistedTaskIds);
+                    mPersistedTaskIds.put(task.userId, new SparseBooleanArray());
+                }
                 mPersistedTaskIds.get(task.userId).put(task.taskId, true);
             }
         }