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

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

Merge "Update display color mode before white balance" into qt-r1-dev

parents 55fe6539 2c2e4a89

services/core/java/com/android/server/display/color/ColorDisplayService.java

+7 −3
Original line number Diff line number Diff line
@@ -465,12 +465,16 @@ public final class ColorDisplayService extends SystemService { 
                    .setMatrix(mNightDisplayTintController.getColorTemperatureSetting());

        }



        // dtm.setColorMode() needs to be called before

        // updateDisplayWhiteBalanceStatus(), this is because the latter calls

        // DisplayTransformManager.needsLinearColorMatrix(), therefore it is dependent

        // on the state of DisplayTransformManager.

        final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);

        dtm.setColorMode(mode, mNightDisplayTintController.getMatrix());



        if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {

            updateDisplayWhiteBalanceStatus();

        }



        final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class);

        dtm.setColorMode(mode, mNightDisplayTintController.getMatrix());

    }



    private void onAccessibilityActivated() {