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

Commit 2079f021 authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Merge "Remove window infos from InputFlinger dumpsys" into udc-dev am: 17e25f43 am: 6f9e6a38 

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



Change-Id: Icac56aac16e258b0f004ae38bdfa2a94b74f673d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99c0b1ef 6f9e6a38

services/inputflinger/dispatcher/InputDispatcher.cpp

+0 −17
Original line number Diff line number Diff line
@@ -5659,14 +5659,6 @@ void InputDispatcher::dumpDispatchStateLocked(std::string& dump) const { 
    } else {

        dump += INDENT "Displays: <none>\n";

    }

    dump += INDENT "Window Infos:\n";

    dump += StringPrintf(INDENT2 "vsync id: %" PRId64 "\n", mWindowInfosVsyncId);

    dump += StringPrintf(INDENT2 "timestamp (ns): %" PRId64 "\n", mWindowInfosTimestamp);

    dump += "\n";

    dump += StringPrintf(INDENT2 "max update delay (ns): %" PRId64 "\n", mMaxWindowInfosDelay);

    dump += StringPrintf(INDENT2 "max update delay vsync id: %" PRId64 "\n",

                         mMaxWindowInfosDelayVsyncId);

    dump += "\n";



    if (!mGlobalMonitorsByDisplay.empty()) {

        for (const auto& [displayId, monitors] : mGlobalMonitorsByDisplay) {
@@ -6708,15 +6700,6 @@ void InputDispatcher::onWindowInfosChanged(const gui::WindowInfosUpdate& update) 
        for (const auto& [displayId, handles] : handlesPerDisplay) {

            setInputWindowsLocked(handles, displayId);

        }



        mWindowInfosVsyncId = update.vsyncId;

        mWindowInfosTimestamp = update.timestamp;



        int64_t delay = systemTime() - update.timestamp;

        if (delay > mMaxWindowInfosDelay) {

            mMaxWindowInfosDelay = delay;

            mMaxWindowInfosDelayVsyncId = update.vsyncId;

        }

    }

    // Wake up poll loop since it may need to make new input dispatching choices.

    mLooper->wake();

services/inputflinger/dispatcher/InputDispatcher.h

+0 −5
Original line number Diff line number Diff line
@@ -204,11 +204,6 @@ private: 


    const IdGenerator mIdGenerator;



    int64_t mWindowInfosVsyncId GUARDED_BY(mLock);

    int64_t mWindowInfosTimestamp GUARDED_BY(mLock);

    int64_t mMaxWindowInfosDelay GUARDED_BY(mLock) = -1;

    int64_t mMaxWindowInfosDelayVsyncId GUARDED_BY(mLock) = -1;



    // With each iteration, InputDispatcher nominally processes one queued event,

    // a timeout, or a response from an input consumer.

    // This method should only be called on the input dispatcher's own thread.