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

Commit 09f910ff authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Ensure to switch to unprotected context if display is not secure. 

Previously we only consider the switch when the display is secure,
however, it is possible that the primary display uses protected context
but virtual display is not secure and hence RenderEngine won't switch
back to unprotected context.  This patch enforce the switch when display
is not secure.

Bug: b/169393573
Test: No flashing when recording Youtube DRM
Test: atest libcompositionengine_test
Change-Id: Ieeda99a92e8d78f7418f7a1e0da9938bcd4753d5
parent 29258758

services/surfaceflinger/CompositionEngine/src/Output.cpp

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,8 @@ std::optional<base::unique_fd> Output::composeSurfaces( 
            needsProtected == renderEngine.isProtected()) {

            mRenderSurface->setProtected(needsProtected);

        }

    } else if (!outputState.isSecure && renderEngine.isProtected()) {

        renderEngine.useProtectedContext(false);

    }



    base::unique_fd fd;

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct DisplayTestCommon : public testing::Test { 
        EXPECT_CALL(mCompositionEngine, getHwComposer()).WillRepeatedly(ReturnRef(mHwComposer));

        EXPECT_CALL(mCompositionEngine, getRenderEngine()).WillRepeatedly(ReturnRef(mRenderEngine));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    }



    DisplayCreationArgs getDisplayCreationArgsForPhysicalHWCDisplay() {

services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp

+14 −0
Original line number Diff line number Diff line
@@ -2950,6 +2950,7 @@ TEST_F(OutputComposeSurfacesTest, doesNothingButSignalNoExpensiveRenderingIfNoCl 
    mOutput.mState.usesClientComposition = false;



    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));



    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));
@@ -2962,6 +2963,7 @@ TEST_F(OutputComposeSurfacesTest, 
    mOutput.mState.flipClientTarget = true;



    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));



    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(mOutputBuffer));

    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));
@@ -2971,6 +2973,7 @@ TEST_F(OutputComposeSurfacesTest, 


TEST_F(OutputComposeSurfacesTest, doesMinimalWorkIfDequeueBufferFailsForClientComposition) {

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));



    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));
@@ -2983,6 +2986,7 @@ TEST_F(OutputComposeSurfacesTest, 
    mOutput.mState.flipClientTarget = true;



    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));



    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));
@@ -2993,6 +2997,7 @@ TEST_F(OutputComposeSurfacesTest, handlesZeroCompositionRequests) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3015,6 +3020,7 @@ TEST_F(OutputComposeSurfacesTest, buildsAndRendersRequestList) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3042,6 +3048,7 @@ TEST_F(OutputComposeSurfacesTest, renderDuplicateClientCompositionRequestsWithou 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3070,6 +3077,7 @@ TEST_F(OutputComposeSurfacesTest, skipDuplicateClientCompositionRequests) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3098,6 +3106,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfBufferChanges) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3129,6 +3138,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfRequestChanges) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r2}))

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r3}));
@@ -3151,6 +3161,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfRequestChanges) { 
struct OutputComposeSurfacesTest_UsesExpectedDisplaySettings : public OutputComposeSurfacesTest {

    OutputComposeSurfacesTest_UsesExpectedDisplaySettings() {

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

        EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

                .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3298,6 +3309,8 @@ TEST_F(OutputComposeSurfacesTest_HandlesProtectedContent, ifDisplayIsNotSecure) 
    mOutput.mState.isSecure = false;

    mLayer2.mLayerFEState.hasProtectedContent = true;

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, isProtected).WillOnce(Return(true));

    EXPECT_CALL(mRenderEngine, useProtectedContext(false)).WillOnce(Return(true));



    mOutput.composeSurfaces(kDebugRegion, kDefaultRefreshArgs);

}
@@ -3390,6 +3403,7 @@ struct OutputComposeSurfacesTest_SetsExpensiveRendering : public OutputComposeSu 
        EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

        EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

                .WillRepeatedly(Return());

        EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillRepeatedly(Return(mOutputBuffer));