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

Commit 35ce4ce9 authored by Kriti Dang's avatar Kriti Dang
Browse files

Fixing issues with minimal post processing and HDR conversion 

The minimal post processing was getting disabled correctly at first, but
if setDisplayPropertiesInternal gets called another time, it was then
re-enabling the HDR conversion

Bug: 296427711
Test: atest DisplayManagerServiceTest
Change-Id: I6b180710153ff6cc212ed14e2fd9f253048a016d
parent 8398d9de

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

+7 −7
Original line number Diff line number Diff line
@@ -2188,8 +2188,10 @@ public final class DisplayManagerService extends SystemService { 


    @GuardedBy("mSyncRoot")

    private boolean hdrConversionIntroducesLatencyLocked() {

        HdrConversionMode mode = getHdrConversionModeSettingInternal();

        final int preferredHdrOutputType =

                getHdrConversionModeSettingInternal().getPreferredHdrOutputType();

                mode.getConversionMode() == HdrConversionMode.HDR_CONVERSION_SYSTEM

                        ? mSystemPreferredHdrOutputType : mode.getPreferredHdrOutputType();

        if (preferredHdrOutputType != Display.HdrCapabilities.HDR_TYPE_INVALID) {

            int[] hdrTypesWithLatency = mInjector.getHdrOutputTypesWithLatency();

            return ArrayUtils.contains(hdrTypesWithLatency, preferredHdrOutputType);
@@ -2470,16 +2472,14 @@ public final class DisplayManagerService extends SystemService { 
            // TODO(b/202378408) set minimal post-processing only if it's supported once we have a

            // separate API for disabling on-device processing.

            boolean mppRequest = isMinimalPostProcessingAllowed() && preferMinimalPostProcessing;

            boolean disableHdrConversionForLatency = false;

            // If HDR conversion introduces latency, disable that in case minimal

            // post-processing is requested

            boolean disableHdrConversionForLatency =

                    mppRequest ? hdrConversionIntroducesLatencyLocked() : false;



            if (display.getRequestedMinimalPostProcessingLocked() != mppRequest) {

                display.setRequestedMinimalPostProcessingLocked(mppRequest);

                shouldScheduleTraversal = true;

                // If HDR conversion introduces latency, disable that in case minimal

                // post-processing is requested

                if (mppRequest) {

                    disableHdrConversionForLatency = hdrConversionIntroducesLatencyLocked();

                }

            }



            if (shouldScheduleTraversal) {