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

Commit 6431d4af authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Set Change::Metadata on LayerMetadata update 

Currently, on layer_state_t::eMetadataChanged, only
Change::GameMode is set. Hence, for other metadata changes
such as METADATA_OWNER_UID, METADATA_MOUSE_CURSOR,
etc. (used by ARC++), these doesn't get propagated until
`forceUpdate=true` or `gameMode` is updated.

This leaves ARC++ LayerFE receiving stale metadata, even
though "update" was received.

Bug: 339382668
Test: atest libsurfaceflinger_unittests
Change-Id: I8130c3505b9808a9aa04d1641dc1c22352d6bf87
parent 28064959

libs/gui/include/gui/LayerMetadata.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ enum class GameMode : int32_t { 
} // namespace android::gui



using android::gui::METADATA_ACCESSIBILITY_ID;

using android::gui::METADATA_CALLING_UID;

using android::gui::METADATA_DEQUEUE_TIME;

using android::gui::METADATA_GAME_MODE;

using android::gui::METADATA_MOUSE_CURSOR;

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+6 −4
Original line number Diff line number Diff line
@@ -785,10 +785,12 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
        }

    }



    if (forceUpdate || snapshot.changes.test(RequestedLayerState::Changes::GameMode)) {

    if (forceUpdate || snapshot.changes.test(RequestedLayerState::Changes::Metadata)) {

        if (snapshot.changes.test(RequestedLayerState::Changes::GameMode)) {

            snapshot.gameMode = requested.metadata.has(gui::METADATA_GAME_MODE)

                    ? requested.gameMode

                    : parentSnapshot.gameMode;

        }

        updateMetadata(snapshot, requested, args);

        if (args.includeMetadata) {

            snapshot.layerMetadata = parentSnapshot.layerMetadata;

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ void RequestedLayerState::merge(const ResolvedComposerState& resolvedComposerSta 
                changes |= RequestedLayerState::Changes::GameMode;

            }

        }

        changes |= RequestedLayerState::Changes::Metadata;

    }

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

        const auto compatibility =

services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp

+45 −1
Original line number Diff line number Diff line
@@ -278,13 +278,57 @@ TEST_F(LayerSnapshotTest, GameMode) { 
    transactions.back().states.front().layerId = 1;

    transactions.back().states.front().state.layerId = static_cast<int32_t>(1);

    mLifecycleManager.applyTransactions(transactions);

    EXPECT_EQ(mLifecycleManager.getGlobalChanges(), RequestedLayerState::Changes::GameMode);

    EXPECT_EQ(mLifecycleManager.getGlobalChanges(),

              RequestedLayerState::Changes::GameMode | RequestedLayerState::Changes::Metadata);

    UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);

    EXPECT_EQ(getSnapshot(1)->clientChanges, layer_state_t::eMetadataChanged);

    EXPECT_EQ(static_cast<int32_t>(getSnapshot(1)->gameMode), 42);

    EXPECT_EQ(static_cast<int32_t>(getSnapshot(11)->gameMode), 42);

}



TEST_F(LayerSnapshotTest, UpdateMetadata) {

    std::vector<TransactionState> transactions;

    transactions.emplace_back();

    transactions.back().states.push_back({});

    transactions.back().states.front().state.what = layer_state_t::eMetadataChanged;

    // This test focuses on metadata used by ARC++ to ensure LayerMetadata is updated correctly,

    // and not using stale data.

    transactions.back().states.front().state.metadata = LayerMetadata();

    transactions.back().states.front().state.metadata.setInt32(METADATA_OWNER_UID, 123);

    transactions.back().states.front().state.metadata.setInt32(METADATA_WINDOW_TYPE, 234);

    transactions.back().states.front().state.metadata.setInt32(METADATA_TASK_ID, 345);

    transactions.back().states.front().state.metadata.setInt32(METADATA_MOUSE_CURSOR, 456);

    transactions.back().states.front().state.metadata.setInt32(METADATA_ACCESSIBILITY_ID, 567);

    transactions.back().states.front().state.metadata.setInt32(METADATA_OWNER_PID, 678);

    transactions.back().states.front().state.metadata.setInt32(METADATA_CALLING_UID, 789);



    transactions.back().states.front().layerId = 1;

    transactions.back().states.front().state.layerId = static_cast<int32_t>(1);



    mLifecycleManager.applyTransactions(transactions);

    EXPECT_EQ(mLifecycleManager.getGlobalChanges(), RequestedLayerState::Changes::Metadata);



    // Setting includeMetadata=true to ensure metadata update is applied to LayerSnapshot

    LayerSnapshotBuilder::Args args{.root = mHierarchyBuilder.getHierarchy(),

                                    .layerLifecycleManager = mLifecycleManager,

                                    .includeMetadata = true,

                                    .displays = mFrontEndDisplayInfos,

                                    .globalShadowSettings = globalShadowSettings,

                                    .supportsBlur = true,

                                    .supportedLayerGenericMetadata = {},

                                    .genericLayerMetadataKeyMap = {}};

    update(mSnapshotBuilder, args);



    EXPECT_EQ(getSnapshot(1)->clientChanges, layer_state_t::eMetadataChanged);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_OWNER_UID, -1), 123);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_WINDOW_TYPE, -1), 234);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_TASK_ID, -1), 345);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_MOUSE_CURSOR, -1), 456);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_ACCESSIBILITY_ID, -1), 567);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_OWNER_PID, -1), 678);

    EXPECT_EQ(getSnapshot(1)->layerMetadata.getInt32(METADATA_CALLING_UID, -1), 789);

}



TEST_F(LayerSnapshotTest, NoLayerVoteForParentWithChildVotes) {

    // ROOT

    // ├── 1