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

Commit 58174bad authored by Arpit Singh's avatar Arpit Singh Committed by Automerger Merge Worker
Browse files

Merge "InputMapper refactor: JoystickInputMapper" into udc-dev am: f552a730 am: d11bfd8d 

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



Change-Id: Ic047000e5cc65122940749f74ed8831873a4a786
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d17b3bf9 d11bfd8d

services/inputflinger/reader/InputDevice.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -510,7 +510,7 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers( 




    // Joystick-like devices.

    // Joystick-like devices.

    if (classes.test(InputDeviceClass::JOYSTICK)) {

    if (classes.test(InputDeviceClass::JOYSTICK)) {

        mappers.push_back(std::make_unique<JoystickInputMapper>(contextPtr, readerConfig));

        mappers.push_back(createInputMapper<JoystickInputMapper>(contextPtr, readerConfig));

    }

    }





    // Motion sensor enabled devices.

    // Motion sensor enabled devices.

services/inputflinger/reader/mapper/JoystickInputMapper.h

+7 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,10 @@ namespace android { 




class JoystickInputMapper : public InputMapper {

class JoystickInputMapper : public InputMapper {

public:

public:

    explicit JoystickInputMapper(InputDeviceContext& deviceContext,

    template <class T, class... Args>

                                 const InputReaderConfiguration& readerConfig);

    friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,

                                                const InputReaderConfiguration& readerConfig,

                                                Args... args);

    virtual ~JoystickInputMapper();

    virtual ~JoystickInputMapper();





    virtual uint32_t getSources() const override;

    virtual uint32_t getSources() const override;
@@ -87,6 +89,9 @@ private: 
        }

        }

    };

    };





    explicit JoystickInputMapper(InputDeviceContext& deviceContext,

                                 const InputReaderConfiguration& readerConfig);



    static Axis createAxis(const AxisInfo& AxisInfo, const RawAbsoluteAxisInfo& rawAxisInfo,

    static Axis createAxis(const AxisInfo& AxisInfo, const RawAbsoluteAxisInfo& rawAxisInfo,

                           bool explicitlyMapped);

                           bool explicitlyMapped);

services/inputflinger/tests/InputReader_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -10904,7 +10904,7 @@ const int32_t JoystickInputMapperTest::RAW_Y_MAX = 32767; 
















TEST_F(JoystickInputMapperTest, Configure_AssignsDisplayUniqueId) {







TEST_F(JoystickInputMapperTest, Configure_AssignsDisplayUniqueId) {











    prepareAxes();







    prepareAxes();











    JoystickInputMapper& mapper = addMapperAndConfigure<JoystickInputMapper>();







    JoystickInputMapper& mapper = constructAndAddMapper<JoystickInputMapper>();



























    mFakePolicy->addInputUniqueIdAssociation(DEVICE_LOCATION, VIRTUAL_DISPLAY_UNIQUE_ID);







    mFakePolicy->addInputUniqueIdAssociation(DEVICE_LOCATION, VIRTUAL_DISPLAY_UNIQUE_ID);