Merge "Fix NPE in TaskRecord."

2014-07-01 23:46:40 +00:00
parent f4061618b1 d4a69704be
commit c2a32dd7d3
1 changed files with 1 additions and 1 deletions
--- 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<ActivityRecord>();
+        setIntent(_intent, info);
    }

    TaskRecord(ActivityManagerService service, int _taskId, Intent _intent, Intent _affinityIntent,