diff options
| author | 2022-11-01 14:46:48 +0000 | |
|---|---|---|
| committer | 2022-11-03 23:06:10 +0000 | |
| commit | aa727ba6a4318f3c86bb8fb0e633575d06cdaea7 (patch) | |
| tree | 94735681a8539eee9db6aa9dad256a40939283c2 | |
| parent | 4a2edb57dc5fe5b221785c5c73cfe9cbc0eb83ec (diff) | |
Ensure configuration is not null.
Test: atest
Bug: 256644836
CtsDisplayTestCases:android.display.cts.BrightnessTest#testSetGetSimpleCurve
Change-Id: I566f9006c85c386335cc8d37cb1807fa0b8f9c5b
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayManagerService.java | 5 |
1 files 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 e907ebfa6471..fc09f8c1b98d 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, |