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

Commit 2d5078c2 authored by Kevin DuBois's avatar Kevin DuBois Committed by Android (Google) Code Review
Browse files

Merge "Revert "SF: accommodate 1.2 format in sampling code""

parents d5324020 b04e9b63

libs/ui/include/ui/GraphicTypes.h

+1 −1
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
namespace android {

namespace ui {



using android::hardware::graphics::common::V1_1::PixelFormat;

using android::hardware::graphics::common::V1_1::RenderIntent;

using android::hardware::graphics::common::V1_2::ColorMode;

using android::hardware::graphics::common::V1_2::Dataspace;

using android::hardware::graphics::common::V1_2::Hdr;

using android::hardware::graphics::common::V1_2::PixelFormat;



}  // namespace ui

}  // namespace android

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+10 −13
Original line number Diff line number Diff line
@@ -260,9 +260,7 @@ Error Composer::createVirtualDisplay(uint32_t width, uint32_t height, 
    const uint32_t bufferSlotCount = 1;

    Error error = kDefaultError;

    if (mClient_2_2) {

        mClient_2_2->createVirtualDisplay_2_2(width, height,

                                              static_cast<types::V1_1::PixelFormat>(*format),

                                              bufferSlotCount,

        mClient_2_2->createVirtualDisplay_2_2(width, height, *format, bufferSlotCount,

                [&](const auto& tmpError, const auto& tmpDisplay,

                    const auto& tmpFormat) {

                    error = tmpError;
@@ -271,8 +269,7 @@ Error Composer::createVirtualDisplay(uint32_t width, uint32_t height, 
                    }



                    *outDisplay = tmpDisplay;

                                                  *format = static_cast<types::V1_2::PixelFormat>(

                                                          tmpFormat);

                    *format = tmpFormat;

                });

    } else {

        mClient->createVirtualDisplay(width, height,

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ namespace V2_3 = hardware::graphics::composer::V2_3; 


using types::V1_0::ColorTransform;

using types::V1_0::Transform;

using types::V1_1::PixelFormat;

using types::V1_1::RenderIntent;

using types::V1_2::ColorMode;

using types::V1_2::Dataspace;

using types::V1_2::Hdr;

using types::V1_2::PixelFormat;



using V2_1::Config;

using V2_1::Display;

services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h

+1 −1
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ namespace mock { 


using android::hardware::graphics::common::V1_0::ColorTransform;

using android::hardware::graphics::common::V1_0::Transform;

using android::hardware::graphics::common::V1_1::PixelFormat;

using android::hardware::graphics::common::V1_1::RenderIntent;

using android::hardware::graphics::common::V1_2::ColorMode;

using android::hardware::graphics::common::V1_2::Dataspace;

using android::hardware::graphics::common::V1_2::Hdr;

using android::hardware::graphics::common::V1_2::PixelFormat;



using android::hardware::graphics::composer::V2_1::Config;

using android::hardware::graphics::composer::V2_1::Display;