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

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

Merge "Remove MultiDisplayTests#many_to_one_display_mapping" into udc-dev am: 5c795951 

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



Change-Id: Ib01881aaf993b084c4a538bff76aa20834239f62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b11b4b73 5c795951

libs/gui/tests/EndToEndNativeInputTest.cpp

+0 −26
Original line number Original line Diff line number Diff line
@@ -1235,32 +1235,6 @@ TEST_F(MultiDisplayTests, virtual_display_receives_input) { 
    surface->expectKey(AKEYCODE_V);

    surface->expectKey(AKEYCODE_V);

}

}





/**

 * When multiple DisplayDevices are mapped to the same layerStack, use the configuration for the

 * display that can receive input.

 */

TEST_F(MultiDisplayTests, many_to_one_display_mapping) {

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

    createDisplay(1000, 1000, false /*isSecure*/, layerStack, false /*receivesInput*/,

                  100 /*offsetX*/, 100 /*offsetY*/);

    createDisplay(1000, 1000, false /*isSecure*/, layerStack, true /*receivesInput*/,

                  200 /*offsetX*/, 200 /*offsetY*/);

    createDisplay(1000, 1000, false /*isSecure*/, layerStack, false /*receivesInput*/,

                  300 /*offsetX*/, 300 /*offsetY*/);

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

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

    surface->showAt(10, 10);



    // Input injection happens in logical display coordinates.

    injectTapOnDisplay(11, 11, layerStack.id);

    // Expect that the display transform for the display that receives input was used.

    surface->expectTapInDisplayCoordinates(211, 211);



    surface->requestFocus(layerStack.id);

    surface->assertFocusChange(true);

    injectKeyOnDisplay(AKEYCODE_V, layerStack.id);

}



TEST_F(MultiDisplayTests, drop_input_for_secure_layer_on_nonsecure_display) {

TEST_F(MultiDisplayTests, drop_input_for_secure_layer_on_nonsecure_display) {

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

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

    createDisplay(1000, 1000, false /*isSecure*/, layerStack);

    createDisplay(1000, 1000, false /*isSecure*/, layerStack);