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

Commit adfb0531 authored by Anthony Han's avatar Anthony Han Committed by android-build-merger
Browse files

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

am: ec0fe7b7

Change-Id: I9fdfeab2919220b58a554baef63e04137ecddcf3
parents 84ce6905 ec0fe7b7

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() {