From 57ed805d4fd4c776b03258bf201ae25a20a1f9f9 Mon Sep 17 00:00:00 2001 From: Silvia Vinyes 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 (cherry picked from commit aa727ba6a4318f3c86bb8fb0e633575d06cdaea7) Merged-in: 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 ef1baf62eecfd..1b20e6a47cb82 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1882,8 +1882,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,