summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Wang <416810799@qq.com>2021-03-06 10:21:55 +0100
committerHan Wang <416810799@qq.com>2021-03-06 10:27:55 +0100
commit4457a818c338ec2d7bdaf2cf4b9499c043eac275 (patch)
treea2f9732b719ea00a0caae34d47df3695ab5d0d39
parent09b2736bced2de8003e389793addb9a4c3ea925d (diff)
lineage-sdk: Fix NPE when using getPictureAdjustmentRanges()
* This method can return null, and List.addAll(null) will throw NPE. Fix it. Change-Id: I4e5fc719209dbfbce785b1e0b07588e2406203ea
-rw-r--r--lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java5
1 files changed, 4 insertions, 1 deletions
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 {