Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ed805d authored by Silvia Vinyes's avatar Silvia Vinyes
Browse files

Ensure configuration is not null. 

Test: atest
Bug: 256644836
CtsDisplayTestCases:android.display.cts.BrightnessTest#testSetGetSimpleCurve
Change-Id: I566f9006c85c386335cc8d37cb1807fa0b8f9c5b
(cherry picked from commit aa727ba6)
Merged-in: I566f9006c85c386335cc8d37cb1807fa0b8f9c5b
parent f265073f

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -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,