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

Commit c033dfbb authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Reset no focused window timeout when window gets focus 

If a window is about to receive focus, then we should stop the "no
focused window" timeout.

Otherwise, we would report an ANR, even though the focused window was
added within the "dispatching timeout" grace period of the application.

Bug: 302326393
Test: TEST=inputflinger_tests; m $TEST && adb sync data && adb shell -t data/nativetest64/$TEST/$TEST --gtest_filter="*FocusedWindowWithoutSetFocusedApplication_NoAnr*" --gtest_repeat=3000 --gtest_break_on_failure
Test: TEST=inputflinger_tests; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST --gtest_filter="*FocusedWindowWithoutSetFocusedApplication_NoAnr" --gtest_repeat=1000 --gtest_break_on_failure
Change-Id: Ie272545e1be23ff5ef4d1bf24507a8ba7e6d170b
parent 80e8cfe3

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −0
Original line number Diff line number Diff line
@@ -6596,6 +6596,7 @@ void InputDispatcher::onFocusChangedLocked(const FocusResolver::FocusChanges& ch 
        }

    }

    if (changes.newFocus) {

        resetNoFocusedWindowTimeoutLocked();

        enqueueFocusEventLocked(changes.newFocus, /*hasFocus=*/true, changes.reason);

    }

services/inputflinger/tests/InputDispatcher_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -7988,7 +7988,7 @@ TEST_F(InputDispatcherMultiWindowAnr, SplitTouch_SingleWindowAnr) { 
TEST_F(InputDispatcherMultiWindowAnr, FocusedWindowWithoutSetFocusedApplication_NoAnr) {

    std::shared_ptr<FakeApplicationHandle> focusedApplication =

            std::make_shared<FakeApplicationHandle>();

    focusedApplication->setDispatchingTimeout(200ms);

    focusedApplication->setDispatchingTimeout(300ms);

    mDispatcher->setFocusedApplication(ADISPLAY_ID_DEFAULT, focusedApplication);

    // The application that owns 'mFocusedWindow' and 'mUnfocusedWindow' is not focused.

    mFocusedWindow->setFocusable(false);