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

Commit 2681a818 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Do not wake the device from media keys on headset. 

Bug: 315732378
Test: atest inputflinger_tests
Change-Id: I60747c6d3ed3455b656a48a08e2b0aa20b2e3aa7
parent 412b7222

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

+32 −1
Original line number Diff line number Diff line
@@ -61,6 +61,36 @@ static bool isSupportedScanCode(int32_t scanCode) { 
            scanCode >= BTN_WHEEL;

}



static bool isMediaKey(int32_t keyCode) {

    switch (keyCode) {

        case AKEYCODE_MEDIA_PLAY:

        case AKEYCODE_MEDIA_PAUSE:

        case AKEYCODE_MEDIA_PLAY_PAUSE:

        case AKEYCODE_MUTE:

        case AKEYCODE_HEADSETHOOK:

        case AKEYCODE_MEDIA_STOP:

        case AKEYCODE_MEDIA_NEXT:

        case AKEYCODE_MEDIA_PREVIOUS:

        case AKEYCODE_MEDIA_REWIND:

        case AKEYCODE_MEDIA_RECORD:

        case AKEYCODE_MEDIA_FAST_FORWARD:

        case AKEYCODE_MEDIA_SKIP_FORWARD:

        case AKEYCODE_MEDIA_SKIP_BACKWARD:

        case AKEYCODE_MEDIA_STEP_FORWARD:

        case AKEYCODE_MEDIA_STEP_BACKWARD:

        case AKEYCODE_MEDIA_AUDIO_TRACK:

        case AKEYCODE_VOLUME_UP:

        case AKEYCODE_VOLUME_DOWN:

        case AKEYCODE_VOLUME_MUTE:

        case AKEYCODE_TV_AUDIO_DESCRIPTION:

        case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP:

        case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN:

            return true;

        default:

            return false;

    }

}



// --- KeyboardInputMapper ---



KeyboardInputMapper::KeyboardInputMapper(InputDeviceContext& deviceContext,
@@ -301,7 +331,8 @@ std::list<NotifyArgs> KeyboardInputMapper::processKey(nsecs_t when, nsecs_t read 
    // For internal keyboards and devices for which the default wake behavior is explicitly

    // prevented (e.g. TV remotes), the key layout file should specify the policy flags for each

    // wake key individually.

    if (down && getDeviceContext().isExternal() && !mParameters.doNotWakeByDefault) {

    if (down && getDeviceContext().isExternal() && !mParameters.doNotWakeByDefault &&

        !(mKeyboardType != AINPUT_KEYBOARD_TYPE_ALPHABETIC && isMediaKey(keyCode))) {

        policyFlags |= POLICY_FLAG_WAKE;

    }

services/inputflinger/tests/InputReader_test.cpp

+31 −1
Original line number Diff line number Diff line
@@ -4100,7 +4100,7 @@ protected: 
    void SetUp() override { InputMapperTest::SetUp(DEVICE_CLASSES | InputDeviceClass::EXTERNAL); }

};



TEST_F(KeyboardInputMapperTest_ExternalDevice, WakeBehavior) {

TEST_F(KeyboardInputMapperTest_ExternalDevice, WakeBehavior_AlphabeticKeyboard) {

    // For external devices, keys will trigger wake on key down. Media keys should also trigger

    // wake if triggered from external devices.
@@ -4139,6 +4139,36 @@ TEST_F(KeyboardInputMapperTest_ExternalDevice, WakeBehavior) { 
    ASSERT_EQ(POLICY_FLAG_WAKE, args.policyFlags);

}



TEST_F(KeyboardInputMapperTest_ExternalDevice, WakeBehavior_NoneAlphabeticKeyboard) {

    // For external devices, keys will trigger wake on key down. Media keys should not trigger

    // wake if triggered from external non-alphaebtic keyboard (e.g. headsets).



    mFakeEventHub->addKey(EVENTHUB_ID, KEY_PLAY, 0, AKEYCODE_MEDIA_PLAY, 0);

    mFakeEventHub->addKey(EVENTHUB_ID, KEY_PLAYPAUSE, 0, AKEYCODE_MEDIA_PLAY_PAUSE,

                          POLICY_FLAG_WAKE);



    KeyboardInputMapper& mapper =

            constructAndAddMapper<KeyboardInputMapper>(AINPUT_SOURCE_KEYBOARD,

                                                       AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC);



    process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_PLAY, 1);

    NotifyKeyArgs args;

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyKeyWasCalled(&args));

    ASSERT_EQ(uint32_t(0), args.policyFlags);



    process(mapper, ARBITRARY_TIME + 1, READ_TIME, EV_KEY, KEY_PLAY, 0);

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyKeyWasCalled(&args));

    ASSERT_EQ(uint32_t(0), args.policyFlags);



    process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_PLAYPAUSE, 1);

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyKeyWasCalled(&args));

    ASSERT_EQ(POLICY_FLAG_WAKE, args.policyFlags);



    process(mapper, ARBITRARY_TIME + 1, READ_TIME, EV_KEY, KEY_PLAYPAUSE, 0);

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyKeyWasCalled(&args));

    ASSERT_EQ(POLICY_FLAG_WAKE, args.policyFlags);

}



TEST_F(KeyboardInputMapperTest_ExternalDevice, DoNotWakeByDefaultBehavior) {

    // Tv Remote key's wake behavior is prescribed by the keylayout file.