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

Commit d8edec06 authored by Patrick Williams's avatar Patrick Williams
Browse files

Trigger composition when FLAG_SECURE changes 

Trigger a visibility change when the FLAG_SECURE value for a layer changes.

Bug: 309153458
Test: LayerLifecycleManagerTest
Change-Id: I467ea62d5f56f548edef2e85ec7573f2acd805cc
parent e4f2eb28

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ void RequestedLayerState::merge(const ResolvedComposerState& resolvedComposerSta 
    LLOGV(layerId, "requested=%" PRIu64 "flags=%" PRIu64, clientState.what, clientChanges);



    if (clientState.what & layer_state_t::eFlagsChanged) {

        if ((oldFlags ^ flags) & (layer_state_t::eLayerHidden | layer_state_t::eLayerOpaque)) {

        if ((oldFlags ^ flags) &

            (layer_state_t::eLayerHidden | layer_state_t::eLayerOpaque |

             layer_state_t::eLayerSecure)) {

            changes |= RequestedLayerState::Changes::Visibility |

                    RequestedLayerState::Changes::VisibleRegion;

        }

services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp

+32 −0
Original line number Diff line number Diff line
@@ -560,4 +560,36 @@ TEST_F(LayerLifecycleManagerTest, alphaChangesAlwaysSetsVisibleRegionFlag) { 
              ftl::Flags<RequestedLayerState::Changes>().string());

}



TEST_F(LayerLifecycleManagerTest, layerSecureChangesSetsVisibilityChangeFlag) {

    // add a default buffer and make the layer secure

    setFlags(1, layer_state_t::eLayerSecure, layer_state_t::eLayerSecure);

    setBuffer(1,

              std::make_shared<renderengine::mock::

                                       FakeExternalTexture>(1U /*width*/, 1U /*height*/,

                                                            1ULL /* bufferId */,

                                                            HAL_PIXEL_FORMAT_RGBA_8888,

                                                            GRALLOC_USAGE_SW_READ_NEVER /*usage*/));



    mLifecycleManager.commitChanges();



    // set new buffer but layer secure doesn't change

    setBuffer(1,

              std::make_shared<renderengine::mock::

                                       FakeExternalTexture>(1U /*width*/, 1U /*height*/,

                                                            2ULL /* bufferId */,

                                                            HAL_PIXEL_FORMAT_RGBA_8888,

                                                            GRALLOC_USAGE_SW_READ_NEVER /*usage*/));

    EXPECT_EQ(mLifecycleManager.getGlobalChanges().get(),

              ftl::Flags<RequestedLayerState::Changes>(RequestedLayerState::Changes::Buffer |

                                                       RequestedLayerState::Changes::Content)

                      .get());

    mLifecycleManager.commitChanges();



    // change layer flags and confirm visibility flag is set

    setFlags(1, layer_state_t::eLayerSecure, 0);

    EXPECT_TRUE(

            mLifecycleManager.getGlobalChanges().test(RequestedLayerState::Changes::Visibility));

    mLifecycleManager.commitChanges();

}



} // namespace android::surfaceflinger::frontend