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

Commit 06a424ce authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "SF: unsupported getLayerGenericMetadataKeys is not an error" into sc-dev am: e6b5063a 

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

Change-Id: Ib5cd769e51129a0b948eb6542507d57ecf8d7c00
parents 2aa359d3 e6b5063a

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -964,8 +964,10 @@ void HWComposer::loadLayerMetadataSupport() { 
    std::vector<Hwc2::IComposerClient::LayerGenericMetadataKey> supportedMetadataKeyInfo;

    const auto error = mComposer->getLayerGenericMetadataKeys(&supportedMetadataKeyInfo);

    if (error != hardware::graphics::composer::V2_4::Error::NONE) {

        if (error != hardware::graphics::composer::V2_4::Error::UNSUPPORTED) {

            ALOGE("%s: %s failed: %s (%d)", __FUNCTION__, "getLayerGenericMetadataKeys",

                  toString(error).c_str(), static_cast<int32_t>(error));

        }

        return;

    }