From a5badf06dd818d67a8cdd2d42803e124be929ab8 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Thu, 11 Sep 2014 12:47:03 -0700
Subject: [PATCH] Add null check to TaskPersister file list.

Ran out of file descriptors and got a null file list. This
checks for null file list.

Fixes bug 17461213.

Change-Id: Ia6d49d0bdb6da98623b76d2b87cd09bc0afa1f27
---
 services/core/java/com/android/server/am/TaskPersister.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/am/TaskPersister.java b/services/core/java/com/android/server/am/TaskPersister.java
index 3cc406b419dab..b21af48c4d3b3 100644
--- a/services/core/java/com/android/server/am/TaskPersister.java
+++ b/services/core/java/com/android/server/am/TaskPersister.java
@@ -347,6 +347,10 @@ public class TaskPersister {
     private static void removeObsoleteFiles(ArraySet<Integer> persistentTaskIds, File[] files) {
         if (DEBUG) Slog.d(TAG, "removeObsoleteFile: persistentTaskIds=" + persistentTaskIds +
                 " files=" + files);
+        if (files == null) {
+            Slog.e(TAG, "File error accessing recents directory (too many files open?).");
+            return;
+        }
         for (int fileNdx = 0; fileNdx < files.length; ++fileNdx) {
             File file = files[fileNdx];
             String filename = file.getName();