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

Commit 16394eb1 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Merge "Deflake InterceptKeyIfKeyUp" into udc-qpr-dev am: cc65a9cc am: 85b58077 

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



Change-Id: Ia84934ac4fb8953fbc8b5ff74127bd3b7681b49e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4836ad10 85b58077

services/inputflinger/tests/InputDispatcher_test.cpp

+8 −3
Original line number Diff line number Diff line
@@ -3635,6 +3635,9 @@ TEST_F(InputDispatcherTest, InterceptKeyByPolicy) { 
                std::chrono::nanoseconds(interceptKeyTimeout).count());

}



/**

 * Keys with ACTION_UP are delivered immediately, even if a long 'intercept key timeout' is set.

 */

TEST_F(InputDispatcherTest, InterceptKeyIfKeyUp) {

    std::shared_ptr<FakeApplicationHandle> application = std::make_shared<FakeApplicationHandle>();

    sp<FakeWindowHandle> window = sp<FakeWindowHandle>::make(application, mDispatcher,
@@ -3646,12 +3649,14 @@ TEST_F(InputDispatcherTest, InterceptKeyIfKeyUp) { 


    window->consumeFocusEvent(true);



    mFakePolicy->setInterceptKeyTimeout(150ms);

    mDispatcher->notifyKey(generateKeyArgs(AKEY_EVENT_ACTION_DOWN, ADISPLAY_ID_DEFAULT));

    mDispatcher->notifyKey(generateKeyArgs(AKEY_EVENT_ACTION_UP, ADISPLAY_ID_DEFAULT));

    window->consumeKeyDown(ADISPLAY_ID_DEFAULT);



    // Set a value that's significantly larger than the default consumption timeout. If the

    // implementation is correct, the actual value doesn't matter; it won't slow down the test.

    mFakePolicy->setInterceptKeyTimeout(600ms);

    mDispatcher->notifyKey(generateKeyArgs(AKEY_EVENT_ACTION_UP, ADISPLAY_ID_DEFAULT));

    // Window should receive key event immediately when same key up.

    window->consumeKeyDown(ADISPLAY_ID_DEFAULT);

    window->consumeKeyUp(ADISPLAY_ID_DEFAULT);

}