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

Commit edb7ba15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not report latency for injected events"

parents f44585d5 de4bf150

include/input/InputTransport.h

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#include <binder/IBinder.h>

#include <input/Input.h>

#include <input/LatencyStatistics.h>

#include <utils/BitSet.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>
@@ -289,12 +288,8 @@ public: 
    status_t receiveFinishedSignal(uint32_t* outSeq, bool* outHandled);



private:

    static constexpr std::chrono::duration TOUCH_STATS_REPORT_PERIOD = 5min;



    sp<InputChannel> mChannel;

    LatencyStatistics mTouchStatistics{TOUCH_STATS_REPORT_PERIOD};



    void reportTouchEventForStatistics(nsecs_t evdevTime);

};



/*

libs/input/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ cc_library { 
                "libutils",

                "libbinder",

                "libui",

                "libstatslog",

            ],



            sanitize: {

libs/input/InputTransport.cpp

+0 −15
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <utils/Trace.h>



#include <input/InputTransport.h>

#include <statslog.h>



using android::base::StringPrintf;
@@ -538,9 +537,6 @@ status_t InputPublisher::publishMotionEvent( 
        msg.body.motion.pointers[i].coords.copyFrom(pointerCoords[i]);

    }



    if (source == AINPUT_SOURCE_TOUCHSCREEN) {

        reportTouchEventForStatistics(eventTime);

    }

    return mChannel->sendMessage(&msg);

}
@@ -567,17 +563,6 @@ status_t InputPublisher::receiveFinishedSignal(uint32_t* outSeq, bool* outHandle 
    return OK;

}



void InputPublisher::reportTouchEventForStatistics(nsecs_t evdevTime) {

    if (mTouchStatistics.shouldReport()) {

        android::util::stats_write(android::util::TOUCH_EVENT_REPORTED, mTouchStatistics.getMin(),

                                   mTouchStatistics.getMax(), mTouchStatistics.getMean(),

                                   mTouchStatistics.getStDev(), mTouchStatistics.getCount());

        mTouchStatistics.reset();

    }

    nsecs_t latency = nanoseconds_to_microseconds(systemTime(CLOCK_MONOTONIC) - evdevTime);

    mTouchStatistics.addValue(latency);

}



// --- InputConsumer ---



InputConsumer::InputConsumer(const sp<InputChannel>& channel) :

libs/input/LatencyStatistics.cpp

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void LatencyStatistics::reset() { 


bool LatencyStatistics::shouldReport() {

    std::chrono::duration timeSinceReport = std::chrono::steady_clock::now() - mLastReportTime;

    return mCount != 0 && timeSinceReport > mReportPeriod;

    return mCount != 0 && timeSinceReport >= mReportPeriod;

}



} // namespace android

services/inputflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ cc_library_shared { 
        "libhidlbase",

        "libinput",

        "liblog",

        "libstatslog",

        "libutils",

        "libui",

        "server_configurable_flags",