From d4a69704befb830ae58d8d6884b5a472eb6a2076 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Mon, 30 Jun 2014 11:12:17 -0700 Subject: [PATCH] Fix NPE in TaskRecord. setIntent() calls toString() when in verbose mode, which NPEs on an uninitialized mActivities. Change-Id: Idccfe857bedc6cac18c590b0f2858166c0a665df --- services/core/java/com/android/server/am/TaskRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 0bd7ef9700e05..3ef94947d9f71 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -131,8 +131,8 @@ final class TaskRecord extends ThumbnailHolder { taskId = _taskId; voiceSession = _voiceSession; voiceInteractor = _voiceInteractor; - setIntent(_intent, info); mActivities = new ArrayList(); + setIntent(_intent, info); } TaskRecord(ActivityManagerService service, int _taskId, Intent _intent, Intent _affinityIntent,