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

Commit 01b8e815 authored by Arpit Singh's avatar Arpit Singh Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-23316821-WWTNIVUOBO" into udc-dev 

* changes:
  Revert "InputMapper refactor: Configure empty InputDevice"
  Revert "InputMapper refactor: Revert "fix touch issue on portrai..."
parents 1889c6a8 c96ed759

services/inputflinger/reader/InputDevice.cpp

+30 −31
Original line number Diff line number Diff line
@@ -151,22 +151,21 @@ void InputDevice::addEmptyEventHubDevice(int32_t eventHubId) { 
        return;

    }

    std::unique_ptr<InputDeviceContext> contextPtr(new InputDeviceContext(*this, eventHubId));

    mDevices.insert(

            {eventHubId,

             std::make_pair<std::unique_ptr<InputDeviceContext>,

                            std::vector<std::unique_ptr<InputMapper>>>(std::move(contextPtr), {})});

    std::vector<std::unique_ptr<InputMapper>> mappers;



    mDevices.insert({eventHubId, std::make_pair(std::move(contextPtr), std::move(mappers))});

}



void InputDevice::populateMappers(int32_t eventHubId,

void InputDevice::addEventHubDevice(int32_t eventHubId,

                                    const InputReaderConfiguration& readerConfig) {

    auto targetDevice = mDevices.find(eventHubId);

    LOG_ALWAYS_FATAL_IF(targetDevice == mDevices.end(),

                        "InputDevice::populateMappers(): missing device with eventHubId %d ",

                        eventHubId);

    // create and add mappers to device

    InputDeviceContext& context = *targetDevice->second.first;

    std::vector<std::unique_ptr<InputMapper>> mappers = createMappers(context, readerConfig);

    targetDevice->second.second = std::move(mappers);

    if (mDevices.find(eventHubId) != mDevices.end()) {

        return;

    }

    std::unique_ptr<InputDeviceContext> contextPtr(new InputDeviceContext(*this, eventHubId));

    std::vector<std::unique_ptr<InputMapper>> mappers = createMappers(*contextPtr, readerConfig);



    // insert the context into the devices set

    mDevices.insert({eventHubId, std::make_pair(std::move(contextPtr), std::move(mappers))});

    // Must change generation to flag this device as changed

    bumpGeneration();

}
@@ -441,29 +440,29 @@ int32_t InputDevice::getState(uint32_t sourceMask, int32_t code, GetStateFunc ge 
}



std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers(

        InputDeviceContext& context, const InputReaderConfiguration& readerConfig) {

    ftl::Flags<InputDeviceClass> classes = context.getDeviceClasses();

        InputDeviceContext& contextPtr, const InputReaderConfiguration& readerConfig) {

    ftl::Flags<InputDeviceClass> classes = contextPtr.getDeviceClasses();

    std::vector<std::unique_ptr<InputMapper>> mappers;



    // Switch-like devices.

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

        mappers.push_back(createInputMapper<SwitchInputMapper>(context, readerConfig));

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

    }



    // Scroll wheel-like devices.

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

        mappers.push_back(createInputMapper<RotaryEncoderInputMapper>(context, readerConfig));

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

    }



    // Vibrator-like devices.

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

        mappers.push_back(createInputMapper<VibratorInputMapper>(context, readerConfig));

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

    }



    // Battery-like devices or light-containing devices.

    // PeripheralController will be created with associated EventHub device.

    if (classes.test(InputDeviceClass::BATTERY) || classes.test(InputDeviceClass::LIGHT)) {

        mController = std::make_unique<PeripheralController>(context);

        mController = std::make_unique<PeripheralController>(contextPtr);

    }



    // Keyboard-like devices.
@@ -483,13 +482,13 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers( 
    }



    if (keyboardSource != 0) {

        mappers.push_back(createInputMapper<KeyboardInputMapper>(context, readerConfig,

        mappers.push_back(createInputMapper<KeyboardInputMapper>(contextPtr, readerConfig,

                                                                 keyboardSource, keyboardType));

    }



    // Cursor-like devices.

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

        mappers.push_back(createInputMapper<CursorInputMapper>(context, readerConfig));

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

    }



    // Touchscreens and touchpad devices.
@@ -497,31 +496,31 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers( 
            sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);

    // TODO(b/272518665): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) touchpads, or

    // at least load this setting from the IDC file.

    const InputDeviceIdentifier identifier = context.getDeviceIdentifier();

    const InputDeviceIdentifier identifier = contextPtr.getDeviceIdentifier();

    const bool isSonyDualShock4Touchpad = identifier.vendor == 0x054c &&

            (identifier.product == 0x05c4 || identifier.product == 0x09cc);

    if (ENABLE_TOUCHPAD_GESTURES_LIBRARY && classes.test(InputDeviceClass::TOUCHPAD) &&

        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {

        mappers.push_back(createInputMapper<TouchpadInputMapper>(context, readerConfig));

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

    } else if (classes.test(InputDeviceClass::TOUCH_MT)) {

        mappers.push_back(createInputMapper<MultiTouchInputMapper>(context, readerConfig));

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

    } else if (classes.test(InputDeviceClass::TOUCH)) {

        mappers.push_back(createInputMapper<SingleTouchInputMapper>(context, readerConfig));

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

    }



    // Joystick-like devices.

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

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

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

    }



    // Motion sensor enabled devices.

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

        mappers.push_back(createInputMapper<SensorInputMapper>(context, readerConfig));

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

    }



    // External stylus-like devices.

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

        mappers.push_back(createInputMapper<ExternalStylusInputMapper>(context, readerConfig));

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

    }

    return mappers;

}

services/inputflinger/reader/InputReader.cpp

+1 −3
Original line number Diff line number Diff line
@@ -334,9 +334,7 @@ std::shared_ptr<InputDevice> InputReader::createDeviceLocked( 
        device = std::make_shared<InputDevice>(&mContext, deviceId, bumpGenerationLocked(),

                                               identifier);

    }

    device->addEmptyEventHubDevice(eventHubId);

    auto unused = device->configure(systemTime(SYSTEM_TIME_MONOTONIC), mConfig, /*changes=*/{});

    device->populateMappers(eventHubId, mConfig);

    device->addEventHubDevice(eventHubId, mConfig);

    return device;

}

services/inputflinger/reader/include/InputDevice.h

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public: 


    void dump(std::string& dump, const std::string& eventHubDevStr);

    void addEmptyEventHubDevice(int32_t eventHubId);

    void populateMappers(int32_t eventHubId, const InputReaderConfiguration& readerConfig);

    void addEventHubDevice(int32_t eventHubId, const InputReaderConfiguration& readerConfig);

    void removeEventHubDevice(int32_t eventHubId);

    [[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,

                                                  const InputReaderConfiguration& readerConfig,
@@ -203,7 +203,7 @@ private: 
    int32_t getState(uint32_t sourceMask, int32_t code, GetStateFunc getStateFunc);



    std::vector<std::unique_ptr<InputMapper>> createMappers(

            InputDeviceContext& context, const InputReaderConfiguration& readerConfig);

            InputDeviceContext& contextPtr, const InputReaderConfiguration& readerConfig);



    PropertyMap mConfiguration;

services/inputflinger/reader/mapper/MultiTouchInputMapper.h

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ public: 
    friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,

                                                const InputReaderConfiguration& readerConfig,

                                                Args... args);

    explicit MultiTouchInputMapper(InputDeviceContext& deviceContext,

                                   const InputReaderConfiguration& readerConfig);



    ~MultiTouchInputMapper() override;
@@ -39,8 +41,6 @@ protected: 
    bool hasStylus() const override;



private:

    explicit MultiTouchInputMapper(InputDeviceContext& deviceContext,

                                   const InputReaderConfiguration& readerConfig);

    // simulate_stylus_with_touch is a debug mode that converts all finger pointers reported by this

    // mapper's touchscreen into stylus pointers, and adds SOURCE_STYLUS to the input device.

    // It is used to simulate stylus events for debugging and testing on a device that does not

services/inputflinger/reader/mapper/SingleTouchInputMapper.h

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ public: 
    friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,

                                                const InputReaderConfiguration& readerConfig,

                                                Args... args);

    explicit SingleTouchInputMapper(InputDeviceContext& deviceContext,

                                    const InputReaderConfiguration& readerConfig);



    ~SingleTouchInputMapper() override;
@@ -40,8 +42,6 @@ protected: 


private:

    SingleTouchMotionAccumulator mSingleTouchMotionAccumulator;

    explicit SingleTouchInputMapper(InputDeviceContext& deviceContext,

                                    const InputReaderConfiguration& readerConfig);

};



} // namespace android