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

Commit 2742b8a4 authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Fix in SurfaceFlinger as HdrConversionCapability no longer used... 

Merge "Fix in SurfaceFlinger as HdrConversionCapability no longer used Parcelable HDR" into udc-dev am: 31769c20

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21850201



Change-Id: I04707a5d3292651ec082b72068c175c51eb17773
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a4975af 31769c20

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1589,8 +1589,8 @@ status_t SurfaceFlinger::getHdrConversionCapabilities( 
    const auto aidlConversionCapability = getHwComposer().getHdrConversionCapabilities();

    const auto aidlConversionCapability = getHwComposer().getHdrConversionCapabilities();

    for (auto capability : aidlConversionCapability) {

    for (auto capability : aidlConversionCapability) {

        gui::HdrConversionCapability tempCapability;

        gui::HdrConversionCapability tempCapability;

        tempCapability.sourceType = static_cast<int>(capability.sourceType.hdr);

        tempCapability.sourceType = static_cast<int>(capability.sourceType);

        tempCapability.outputType = static_cast<int>(capability.outputType->hdr);

        tempCapability.outputType = static_cast<int>(capability.outputType);

        tempCapability.addsLatency = capability.addsLatency;

        tempCapability.addsLatency = capability.addsLatency;

        hdrConversionCapabilities->push_back(tempCapability);

        hdrConversionCapabilities->push_back(tempCapability);

    }

    }