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

Commit fe03d7a6 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Notify InputListener when there an changes to input devices am: e3da4bbc am: d2c12c5a 

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



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

services/inputflinger/InputListener.cpp

+6 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include <android-base/stringprintf.h>

#include <android/log.h>

#include <math.h>

#include <utils/Trace.h>



using android::base::StringPrintf;
@@ -47,6 +46,7 @@ Visitor(V...) -> Visitor<V...>; 


void InputListenerInterface::notify(const NotifyArgs& generalArgs) {

    Visitor v{

            [&](const NotifyInputDevicesChangedArgs& args) { notifyInputDevicesChanged(args); },

            [&](const NotifyConfigurationChangedArgs& args) { notifyConfigurationChanged(&args); },

            [&](const NotifyKeyArgs& args) { notifyKey(&args); },

            [&](const NotifyMotionArgs& args) { notifyMotion(&args); },
@@ -73,6 +73,11 @@ static inline void traceEvent(const char* functionName, int32_t id) { 
QueuedInputListener::QueuedInputListener(InputListenerInterface& innerListener)

      : mInnerListener(innerListener) {}



void QueuedInputListener::notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyConfigurationChanged(

        const NotifyConfigurationChangedArgs* args) {

    traceEvent(__func__, args->id);

services/inputflinger/InputProcessor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -413,6 +413,12 @@ void InputProcessor::setMotionClassifierEnabled(bool enabled) { 
    }

}



void InputProcessor::notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) {

    // pass through

    mQueuedListener.notify(args);

    mQueuedListener.flush();

}



void InputProcessor::notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args) {

    // pass through

    mQueuedListener.notifyConfigurationChanged(args);

services/inputflinger/InputProcessor.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ class InputProcessor : public InputProcessorInterface { 
public:

    explicit InputProcessor(InputListenerInterface& listener);



    void notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) override;

    void notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args) override;

    void notifyKey(const NotifyKeyArgs* args) override;

    void notifyMotion(const NotifyMotionArgs* args) override;

services/inputflinger/NotifyArgs.cpp

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ using android::base::StringPrintf; 


namespace android {



// --- NotifyInputDevicesChangedArgs ---



NotifyInputDevicesChangedArgs::NotifyInputDevicesChangedArgs(int32_t id,

                                                             std::vector<InputDeviceInfo> infos)

      : id(id), inputDeviceInfos(std::move(infos)) {}



// --- NotifyConfigurationChangedArgs ---



NotifyConfigurationChangedArgs::NotifyConfigurationChangedArgs(int32_t id, nsecs_t eventTime)
@@ -234,6 +240,7 @@ Visitor(V...) -> Visitor<V...>; 


const char* toString(const NotifyArgs& args) {

    Visitor toStringVisitor{

            [&](const NotifyInputDevicesChangedArgs&) { return "NotifyInputDevicesChangedArgs"; },

            [&](const NotifyConfigurationChangedArgs&) { return "NotifyConfigurationChangedArgs"; },

            [&](const NotifyKeyArgs&) { return "NotifyKeyArgs"; },

            [&](const NotifyMotionArgs&) { return "NotifyMotionArgs"; },

services/inputflinger/UnwantedInteractionBlocker.cpp

+7 −0
Original line number Diff line number Diff line
@@ -411,6 +411,13 @@ void UnwantedInteractionBlocker::notifyPointerCaptureChanged( 
}



void UnwantedInteractionBlocker::notifyInputDevicesChanged(

        const NotifyInputDevicesChangedArgs& args) {

    onInputDevicesChanged(args.inputDeviceInfos);

    mQueuedListener.notify(args);

    mQueuedListener.flush();

}



void UnwantedInteractionBlocker::onInputDevicesChanged(

        const std::vector<InputDeviceInfo>& inputDevices) {

    std::scoped_lock lock(mLock);

    if (!mEnablePalmRejection) {