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

Commit b7f37551 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Custom names for windows in targeted injection tests" into main

parents a62621ec e3ce4125

services/inputflinger/tests/InputDispatcher_test.cpp

+13 −14
Original line number Diff line number Diff line
@@ -9721,12 +9721,11 @@ struct User { 
                                          mPolicyFlags);

    }



    sp<FakeWindowHandle> createWindow() const {

    sp<FakeWindowHandle> createWindow(const char* name) const {

        std::shared_ptr<FakeApplicationHandle> overlayApplication =

                std::make_shared<FakeApplicationHandle>();

        sp<FakeWindowHandle> window =

                sp<FakeWindowHandle>::make(overlayApplication, mDispatcher, "Owned Window",

                                           ADISPLAY_ID_DEFAULT);

        sp<FakeWindowHandle> window = sp<FakeWindowHandle>::make(overlayApplication, mDispatcher,

                                                                 name, ADISPLAY_ID_DEFAULT);

        window->setOwnerInfo(mPid, mUid);

        return window;

    }
@@ -9736,7 +9735,7 @@ using InputDispatcherTargetedInjectionTest = InputDispatcherTest; 


TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoOwnedWindow) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto window = owner.createWindow("Owned window");

    mDispatcher->onWindowInfosChanged({{*window->getInfo()}, {}, 0, 0});



    EXPECT_EQ(InputEventInjectionResult::SUCCEEDED,
@@ -9753,7 +9752,7 @@ TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoOwnedWindow) { 


TEST_F(InputDispatcherTargetedInjectionTest, CannotInjectIntoUnownedWindow) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto window = owner.createWindow("Owned window");

    mDispatcher->onWindowInfosChanged({{*window->getInfo()}, {}, 0, 0});



    auto rando = User(mDispatcher, gui::Pid{20}, gui::Uid{21});
@@ -9770,8 +9769,8 @@ TEST_F(InputDispatcherTargetedInjectionTest, CannotInjectIntoUnownedWindow) { 


TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoOwnedSpyWindow) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto spy = owner.createWindow();

    auto window = owner.createWindow("Owned window");

    auto spy = owner.createWindow("Owned spy");

    spy->setSpy(true);

    spy->setTrustedOverlay(true);

    mDispatcher->onWindowInfosChanged({{*spy->getInfo(), *window->getInfo()}, {}, 0, 0});
@@ -9784,10 +9783,10 @@ TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoOwnedSpyWindow) { 


TEST_F(InputDispatcherTargetedInjectionTest, CannotInjectIntoUnownedSpyWindow) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto window = owner.createWindow("Owned window");



    auto rando = User(mDispatcher, gui::Pid{20}, gui::Uid{21});

    auto randosSpy = rando.createWindow();

    auto randosSpy = rando.createWindow("Rando's spy");

    randosSpy->setSpy(true);

    randosSpy->setTrustedOverlay(true);

    mDispatcher->onWindowInfosChanged({{*randosSpy->getInfo(), *window->getInfo()}, {}, 0, 0});
@@ -9802,10 +9801,10 @@ TEST_F(InputDispatcherTargetedInjectionTest, CannotInjectIntoUnownedSpyWindow) { 


TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoAnyWindowWhenNotTargeting) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto window = owner.createWindow("Owned window");



    auto rando = User(mDispatcher, gui::Pid{20}, gui::Uid{21});

    auto randosSpy = rando.createWindow();

    auto randosSpy = rando.createWindow("Rando's spy");

    randosSpy->setSpy(true);

    randosSpy->setTrustedOverlay(true);

    mDispatcher->onWindowInfosChanged({{*randosSpy->getInfo(), *window->getInfo()}, {}, 0, 0});
@@ -9827,10 +9826,10 @@ TEST_F(InputDispatcherTargetedInjectionTest, CanInjectIntoAnyWindowWhenNotTarget 


TEST_F(InputDispatcherTargetedInjectionTest, CannotGenerateActionOutsideToOtherUids) {

    auto owner = User(mDispatcher, gui::Pid{10}, gui::Uid{11});

    auto window = owner.createWindow();

    auto window = owner.createWindow("Owned window");



    auto rando = User(mDispatcher, gui::Pid{20}, gui::Uid{21});

    auto randosWindow = rando.createWindow();

    auto randosWindow = rando.createWindow("Rando's window");

    randosWindow->setFrame(Rect{-10, -10, -5, -5});

    randosWindow->setWatchOutsideTouch(true);

    mDispatcher->onWindowInfosChanged({{*randosWindow->getInfo(), *window->getInfo()}, {}, 0, 0});