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

Commit 7b255820 authored by Valerie Hau's avatar Valerie Hau Committed by Android (Google) Code Review
Browse files

Merge "Fix Mapper Protected test" into rvc-dev

parents 9a3f5f02 2b4caee3

graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -965,7 +965,7 @@ TEST_P(GraphicsMapperHidlTest, GetProtectedContent) { 




    const native_handle_t* bufferHandle = nullptr;

    const native_handle_t* bufferHandle = nullptr;

    bufferHandle = mGralloc->allocate(info, true, true);

    bufferHandle = mGralloc->allocate(info, true, true);

    if (bufferHandle) {

    if (!bufferHandle) {

        GTEST_SUCCEED() << "unable to allocate protected content";

        GTEST_SUCCEED() << "unable to allocate protected content";

        return;

        return;

    }

    }
@@ -1268,7 +1268,7 @@ TEST_P(GraphicsMapperHidlTest, SetProtectedContent) { 
    info.usage = BufferUsage::PROTECTED | BufferUsage::COMPOSER_OVERLAY;

    info.usage = BufferUsage::PROTECTED | BufferUsage::COMPOSER_OVERLAY;





    bufferHandle = mGralloc->allocate(info, true, true);

    bufferHandle = mGralloc->allocate(info, true, true);

    if (bufferHandle) {

    if (!bufferHandle) {

        GTEST_SUCCEED() << "unable to allocate protected content";

        GTEST_SUCCEED() << "unable to allocate protected content";

        return;

        return;

    }

    }