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

Commit a4c00112 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Revert "Revert "Remove notifyConfigurationChanged listener and p..." 

Revert submission 28384450-revert-28338641-remove_notify_configuration_changed-KXBQXRGFTY

Reason for revert: Resubmitting

Reverted changes: /q/submissionid:28384450-revert-28338641-remove_notify_configuration_changed-KXBQXRGFTY

Change-Id: Iea84fe0c6362d3c0c3fe2c41d9421c10070698d1
parent c3cf1a29

services/inputflinger/InputDeviceMetricsCollector.cpp

+0 −9
Original line number Diff line number Diff line
@@ -133,15 +133,6 @@ void InputDeviceMetricsCollector::notifyInputDevicesChanged( 
    mNextListener.notify(args);

}



void InputDeviceMetricsCollector::notifyConfigurationChanged(

        const NotifyConfigurationChangedArgs& args) {

    {

        std::scoped_lock lock(mLock);

        reportCompletedSessions();

    }

    mNextListener.notify(args);

}



void InputDeviceMetricsCollector::notifyKey(const NotifyKeyArgs& args) {

    {

        std::scoped_lock lock(mLock);

services/inputflinger/InputDeviceMetricsCollector.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ public: 
                                std::chrono::nanoseconds usageSessionTimeout);



    void notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) override;

    void notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) override;

    void notifyKey(const NotifyKeyArgs& args) override;

    void notifyMotion(const NotifyMotionArgs& args) override;

    void notifySwitch(const NotifySwitchArgs& args) override;

services/inputflinger/InputFilter.cpp

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ void InputFilter::notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& 
    mNextListener.notify(args);

}



void InputFilter::notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) {

    mNextListener.notify(args);

}



void InputFilter::notifyKey(const NotifyKeyArgs& args) {

    if (isFilterEnabled()) {

        LOG_ALWAYS_FATAL_IF(!mInputFilterRust->notifyKey(notifyKeyArgsToKeyEvent(args)).isOk());

services/inputflinger/InputFilter.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ public: 
                         InputFilterPolicyInterface& policy);

    ~InputFilter() override = default;

    void notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) override;

    void notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) override;

    void notifyKey(const NotifyKeyArgs& args) override;

    void notifyMotion(const NotifyMotionArgs& args) override;

    void notifySwitch(const NotifySwitchArgs& args) override;

services/inputflinger/InputListener.cpp

+0 −12
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 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); },

            [&](const NotifySwitchArgs& args) { notifySwitch(args); },
@@ -68,10 +67,6 @@ void QueuedInputListener::notifyInputDevicesChanged(const NotifyInputDevicesChan 
    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) {

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyKey(const NotifyKeyArgs& args) {

    mArgsQueue.emplace_back(args);

}
@@ -119,13 +114,6 @@ void TracedInputListener::notifyInputDevicesChanged(const NotifyInputDevicesChan 
    mInnerListener.notify(args);

}



void TracedInputListener::notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(),

                   StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id));

    mInnerListener.notify(args);

}



void TracedInputListener::notifyKey(const NotifyKeyArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(),