From 4457a818c338ec2d7bdaf2cf4b9499c043eac275 Mon Sep 17 00:00:00 2001
From: Han Wang <416810799@qq.com>
Date: Sat, 6 Mar 2021 10:21:55 +0100
Subject: [PATCH] lineage-sdk: Fix NPE when using getPictureAdjustmentRanges()

 * This method can return null, and List.addAll(null) will
   throw NPE. Fix it.

Change-Id: I4e5fc719209dbfbce785b1e0b07588e2406203ea
---
 .../internal/display/PictureAdjustmentController.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
index e64377e6..de4865c0 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
@@ -51,7 +51,10 @@ public class PictureAdjustmentController extends LiveDisplayFeature {
 
         boolean usePA = mHardware.isSupported(LineageHardwareManager.FEATURE_PICTURE_ADJUSTMENT);
         if (usePA) {
-            mRanges.addAll(mHardware.getPictureAdjustmentRanges());
+            final List<Range<Float>> r = mHardware.getPictureAdjustmentRanges();
+            if (r != null) {
+                mRanges.addAll(r);
+            }
             if (mRanges.size() < 4) {
                 usePA = false;
             } else {