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

Commit 9659e345 authored by Nergi Rahardi's avatar Nergi Rahardi Committed by Android (Google) Code Review
Browse files

Merge changes I912d5093,I9889ac6c into main 

* changes:
  Revert^2 "SF: Update metadata of unvisible layers to backend"
  Revert^2 "Set Change::Metadata on LayerMetadata update"
parents 29f1274c 0dfc096b

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

+31 −9
Original line number Diff line number Diff line
@@ -317,6 +317,21 @@ void updateMetadata(LayerSnapshot& snapshot, const RequestedLayerState& requeste 
    }

}



void updateMetadataAndGameMode(LayerSnapshot& snapshot, const RequestedLayerState& requested,

                               const LayerSnapshotBuilder::Args& args,

                               const LayerSnapshot& parentSnapshot) {

    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;

        snapshot.layerMetadata.merge(requested.metadata);

    }

}



void clearChanges(LayerSnapshot& snapshot) {

    snapshot.changes.clear();

    snapshot.clientChanges = 0;
@@ -762,6 +777,11 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
                                 RequestedLayerState::Changes::Input)) {

            updateInput(snapshot, requested, parentSnapshot, path, args);

        }

        if (forceUpdate ||

            (args.includeMetadata &&

             snapshot.changes.test(RequestedLayerState::Changes::Metadata))) {

            updateMetadataAndGameMode(snapshot, requested, args, parentSnapshot);

        }

        return;

    }
@@ -801,15 +821,8 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
        }

    }



    if (forceUpdate || 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;

            snapshot.layerMetadata.merge(requested.metadata);

        }

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

        updateMetadataAndGameMode(snapshot, requested, args, parentSnapshot);

    }



    if (forceUpdate || snapshot.clientChanges & layer_state_t::eFixedTransformHintChanged ||
@@ -1178,6 +1191,15 @@ void LayerSnapshotBuilder::forEachVisibleSnapshot(const Visitor& visitor) { 
    }

}



void LayerSnapshotBuilder::forEachSnapshot(const Visitor& visitor,

                                           const ConstPredicate& predicate) {

    for (int i = 0; i < mNumInterestingSnapshots; i++) {

        std::unique_ptr<LayerSnapshot>& snapshot = mSnapshots.at((size_t)i);

        if (!predicate(*snapshot)) continue;

        visitor(snapshot);

    }

}



void LayerSnapshotBuilder::forEachInputSnapshot(const ConstVisitor& visitor) const {

    for (int i = mNumInterestingSnapshots - 1; i >= 0; i--) {

        LayerSnapshot& snapshot = *mSnapshots[(size_t)i];

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ public: 
    // Visit each visible snapshot in z-order and move the snapshot if needed

    void forEachVisibleSnapshot(const Visitor& visitor);



    typedef std::function<bool(const LayerSnapshot& snapshot)> ConstPredicate;

    // Visit each snapshot that satisfies the predicate and move the snapshot if needed with visible

    // snapshots in z-order

    void forEachSnapshot(const Visitor& visitor, const ConstPredicate& predicate);



    // Visit each snapshot interesting to input reverse z-order

    void forEachInputSnapshot(const ConstVisitor& visitor) const;

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/SurfaceFlinger.cpp

+9 −1
Original line number Diff line number Diff line
@@ -9335,7 +9335,9 @@ std::vector<std::pair<Layer*, LayerFE*>> SurfaceFlinger::moveSnapshotsToComposit 
    std::vector<std::pair<Layer*, LayerFE*>> layers;

    if (mLayerLifecycleManagerEnabled) {

        nsecs_t currentTime = systemTime();

        mLayerSnapshotBuilder.forEachVisibleSnapshot(

        const bool needsMetadata = mCompositionEngine->getFeatureFlags().test(

                compositionengine::Feature::kSnapshotLayerMetadata);

        mLayerSnapshotBuilder.forEachSnapshot(

                [&](std::unique_ptr<frontend::LayerSnapshot>& snapshot) FTL_FAKE_GUARD(

                        kMainThreadContext) {

                    if (cursorOnly &&
@@ -9358,6 +9360,12 @@ std::vector<std::pair<Layer*, LayerFE*>> SurfaceFlinger::moveSnapshotsToComposit 
                    layerFE->mSnapshot = std::move(snapshot);

                    refreshArgs.layers.push_back(layerFE);

                    layers.emplace_back(legacyLayer.get(), layerFE.get());

                },

                [needsMetadata](const frontend::LayerSnapshot& snapshot) {

                    return snapshot.isVisible ||

                            (needsMetadata &&

                             snapshot.changes.test(

                                     frontend::RequestedLayerState::Changes::Metadata));

                });

    }

    if (!mLayerLifecycleManagerEnabled) {