From db860eb1243c439c64e2c5a0205e06a4f1e49eb2 Mon Sep 17 00:00:00 2001
From: Peeyush Agarwal <apeeyush@google.com>
Date: Wed, 7 Mar 2018 16:21:50 +0000
Subject: [PATCH] ParceledListSlice shouldn't be created with null

Bug: 74242190
Change-Id: Ia539efb46bba0bab7a0bfdb0c9b4b2b09116acbf
Test: Reproduced the issue, then verified that this fixes it.
---
 .../java/com/android/server/display/BrightnessTracker.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java
index df60c6654c4ba..2cae58591d583 100644
--- a/services/core/java/com/android/server/display/BrightnessTracker.java
+++ b/services/core/java/com/android/server/display/BrightnessTracker.java
@@ -69,6 +69,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
@@ -649,7 +650,10 @@ public class BrightnessTracker {
     }
 
     public ParceledListSlice<AmbientBrightnessDayStats> getAmbientBrightnessStats(int userId) {
-        return new ParceledListSlice<>(mAmbientBrightnessStatsTracker.getUserStats(userId));
+        ArrayList<AmbientBrightnessDayStats> stats = mAmbientBrightnessStatsTracker.getUserStats(
+                userId);
+        return (stats != null) ? new ParceledListSlice<>(stats) : new ParceledListSlice<>(
+                Collections.EMPTY_LIST);
     }
 
     // Not allowed to keep the SensorEvent so used to copy the data we care about.