diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-11 22:36:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 22:36:18 +0000 |
| commit | 532e551e68530f986c5e197810a33061b70f159f (patch) | |
| tree | 680d581578ec49a9c0a01a92ff2181d6b263314b | |
| parent | ba4f57a1c6979676d20ff29a614deb64171230e6 (diff) | |
| parent | a5badf06dd818d67a8cdd2d42803e124be929ab8 (diff) | |
| download | frameworks_base-532e551e68530f986c5e197810a33061b70f159f.zip frameworks_base-532e551e68530f986c5e197810a33061b70f159f.tar.gz frameworks_base-532e551e68530f986c5e197810a33061b70f159f.tar.bz2 | |
Merge "Add null check to TaskPersister file list." into lmp-dev
| -rw-r--r-- | services/core/java/com/android/server/am/TaskPersister.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/TaskPersister.java b/services/core/java/com/android/server/am/TaskPersister.java index 3cc406b..b21af48 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(); |