diff options
| -rw-r--r-- | services/core/java/com/android/server/display/BrightnessTracker.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java index cabccf37ebaa..171f40ed37cd 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; @@ -657,7 +658,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. |