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

Commit 85852492 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE in NightDisplayService when VR mode is invoked"

parents 813ef268 1e9b4b07

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

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public final class NightDisplayService extends SystemService 
                            getLocalService(DisplayTransformManager.class);

                    if (enabled) {

                        dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, MATRIX_IDENTITY);

                    } else if (mController.isActivated()) {

                    } else if (mController != null && mController.isActivated()) {

                        dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, MATRIX_NIGHT);

                    }

                }