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

Commit 5dc28935 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Reland: Send WindowInfo even if the window isn't associated with a DisplayDevice am: 83aca388 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19451717



Change-Id: I4ef0066be7fa47dbf90ed0a47696b1a3e43229f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b09c75bf 83aca388

libs/gui/tests/EndToEndNativeInputTest.cpp

+8 −3
Original line number Diff line number Diff line
@@ -1184,18 +1184,23 @@ public: 
    std::vector<sp<IGraphicBufferProducer>> mProducers;

};



TEST_F(MultiDisplayTests, drop_input_if_layer_on_invalid_display) {

TEST_F(MultiDisplayTests, drop_touch_if_layer_on_invalid_display) {

    ui::LayerStack layerStack = ui::LayerStack::fromValue(42);

    // Do not create a display associated with the LayerStack.

    std::unique_ptr<InputSurface> surface = makeSurface(100, 100);

    surface->doTransaction([&](auto &t, auto &sc) { t.setLayerStack(sc, layerStack); });

    surface->showAt(100, 100);



    // Touches should be dropped if the layer is on an invalid display.

    injectTapOnDisplay(101, 101, layerStack.id);

    EXPECT_EQ(surface->consumeEvent(100), nullptr);



    // However, we still let the window be focused and receive keys.

    surface->requestFocus(layerStack.id);

    injectKeyOnDisplay(AKEYCODE_V, layerStack.id);

    surface->assertFocusChange(true);



    EXPECT_EQ(surface->consumeEvent(100), nullptr);

    injectKeyOnDisplay(AKEYCODE_V, layerStack.id);

    surface->expectKey(AKEYCODE_V);

}



TEST_F(MultiDisplayTests, virtual_display_receives_input) {

services/surfaceflinger/Layer.cpp

+14 −3
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
namespace android {

namespace {

constexpr int kDumpTableRowLength = 159;

const ui::Transform kIdentityTransform;

} // namespace



using namespace ftl::flag_operators;
@@ -2164,7 +2165,8 @@ void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet 
    if ((traceFlags & LayerTracing::TRACE_INPUT) && needsInputInfo()) {

        WindowInfo info;

        if (useDrawing) {

            info = fillInputInfo(ui::Transform(), /* displayIsSecure */ true);

            info = fillInputInfo(

                    InputDisplayArgs{.transform = &kIdentityTransform, .isSecure = true});

        } else {

            info = state.inputInfo;

        }
@@ -2371,7 +2373,7 @@ void Layer::handleDropInputMode(gui::WindowInfo& info) const { 
    }

}



WindowInfo Layer::fillInputInfo(const ui::Transform& displayTransform, bool displayIsSecure) {

WindowInfo Layer::fillInputInfo(const InputDisplayArgs& displayArgs) {

    if (!hasInputInfo()) {

        mDrawingState.inputInfo.name = getName();

        mDrawingState.inputInfo.ownerUid = mOwnerUid;
@@ -2380,12 +2382,21 @@ WindowInfo Layer::fillInputInfo(const ui::Transform& displayTransform, bool disp 
        mDrawingState.inputInfo.displayId = getLayerStack().id;

    }



    const ui::Transform& displayTransform =

            displayArgs.transform != nullptr ? *displayArgs.transform : kIdentityTransform;



    WindowInfo info = mDrawingState.inputInfo;

    info.id = sequence;

    info.displayId = getLayerStack().id;



    fillInputFrameInfo(info, displayTransform);



    if (displayArgs.transform == nullptr) {

        // Do not let the window receive touches if it is not associated with a valid display

        // transform. We still allow the window to receive keys and prevent ANRs.

        info.inputConfig |= WindowInfo::InputConfig::NOT_TOUCHABLE;

    }



    // For compatibility reasons we let layers which can receive input

    // receive input before they have actually submitted a buffer. Because

    // of this we use canReceiveInput instead of isVisible to check the
@@ -2403,7 +2414,7 @@ WindowInfo Layer::fillInputInfo(const ui::Transform& displayTransform, bool disp 


    // If the window will be blacked out on a display because the display does not have the secure

    // flag and the layer has the secure flag set, then drop input.

    if (!displayIsSecure && isSecure()) {

    if (!displayArgs.isSecure && isSecure()) {

        info.inputConfig |= WindowInfo::InputConfig::DROP_INPUT;

    }

services/surfaceflinger/Layer.h

+5 −1
Original line number Diff line number Diff line
@@ -844,7 +844,11 @@ public: 
    bool getPremultipledAlpha() const;

    void setInputInfo(const gui::WindowInfo& info);



    gui::WindowInfo fillInputInfo(const ui::Transform& displayTransform, bool displayIsSecure);

    struct InputDisplayArgs {

        const ui::Transform* transform = nullptr;

        bool isSecure = false;

    };

    gui::WindowInfo fillInputInfo(const InputDisplayArgs& displayArgs);



    /**

     * Returns whether this layer has an explicitly set input-info.

services/surfaceflinger/SurfaceFlinger.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3329,11 +3329,11 @@ void SurfaceFlinger::buildWindowInfos(std::vector<WindowInfo>& outWindowInfos, 
    mDrawingState.traverseInReverseZOrder([&](Layer* layer) {

        if (!layer->needsInputInfo()) return;



        // Do not create WindowInfos for windows on displays that cannot receive input.

        if (const auto opt = displayInputInfos.get(layer->getLayerStack())) {

            const auto& info = opt->get();

            outWindowInfos.push_back(layer->fillInputInfo(info.transform, info.isSecure));

        }

        const auto opt = displayInputInfos.get(layer->getLayerStack(),

                                               [](const auto& info) -> Layer::InputDisplayArgs {

                                                   return {&info.transform, info.isSecure};

                                               });

        outWindowInfos.push_back(layer->fillInputInfo(opt.value_or(Layer::InputDisplayArgs{})));

    });



    sNumWindowInfos = outWindowInfos.size();