From aa727ba6a4318f3c86bb8fb0e633575d06cdaea7 Mon Sep 17 00:00:00 2001
From: Silvia Vinyes <silviavinyes@google.com>
Date: Tue, 1 Nov 2022 14:46:48 +0000
Subject: [PATCH] Ensure configuration is not null.

Test: atest
Bug: 256644836
CtsDisplayTestCases:android.display.cts.BrightnessTest#testSetGetSimpleCurve
Change-Id: I566f9006c85c386335cc8d37cb1807fa0b8f9c5b
---
 .../com/android/server/display/DisplayManagerService.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index e907ebfa64712..fc09f8c1b98d7 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1902,8 +1902,9 @@ public final class DisplayManagerService extends SystemService {
                 if (displayDevice == null) {
                     return;
                 }
-                if (mLogicalDisplayMapper.getDisplayLocked(displayDevice)
-                        .getDisplayInfoLocked().type == Display.TYPE_INTERNAL) {
+                if (mLogicalDisplayMapper.getDisplayLocked(displayDevice) != null
+                        && mLogicalDisplayMapper.getDisplayLocked(displayDevice)
+                        .getDisplayInfoLocked().type == Display.TYPE_INTERNAL && c != null) {
                     FrameworkStatsLog.write(FrameworkStatsLog.BRIGHTNESS_CONFIGURATION_UPDATED,
                                 c.getCurve().first,
                                 c.getCurve().second,