From 012494405a35a0d049ee8f731894859552d0757c Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Tue, 3 Jan 2023 11:19:54 +0000
Subject: [PATCH] Fix NPE on ShutdownCheckPoints

Fix list files to handle null File array while filtering for existing checkpoint dump files for cleanup.

Change-Id: I275d9a87996425392feb42362c967eb1cdcba80b
Fix: 256460338
Test: ShutdownCheckPointsTest
---
 .../java/com/android/server/power/ShutdownCheckPoints.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/power/ShutdownCheckPoints.java b/services/core/java/com/android/server/power/ShutdownCheckPoints.java
index 1a9eae6b6d8df..32f1bcfaad76d 100644
--- a/services/core/java/com/android/server/power/ShutdownCheckPoints.java
+++ b/services/core/java/com/android/server/power/ShutdownCheckPoints.java
@@ -54,6 +54,7 @@ public final class ShutdownCheckPoints {
     private static final int MAX_DUMP_FILES = 20;
     private static final SimpleDateFormat DATE_FORMAT =
             new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS z");
+    private static final File[] EMPTY_FILE_ARRAY = {};
 
     private final ArrayList<CheckPoint> mCheckPoints;
     private final Injector mInjector;
@@ -381,6 +382,9 @@ public final class ShutdownCheckPoints {
                     return true;
                 }
             });
+            if (files == null) {
+                return EMPTY_FILE_ARRAY;
+            }
             Arrays.sort(files);
             return files;
         }