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

Commit 5ede2629 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove "no focused window" log" into main

parents e88f4818 15a919e0

services/inputflinger/dispatcher/FocusResolver.h

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ public: 
    void displayRemoved(ui::LogicalDisplayId displayId);



    // exposed for debugging

    bool hasFocusedWindowTokens() const { return !mFocusedWindowTokenByDisplay.empty(); }

    std::string dumpFocusedWindows() const;

    std::string dump() const;



private:
@@ -123,6 +121,8 @@ private: 
            ui::LogicalDisplayId displayId, const std::string& reason, const sp<IBinder>& token,

            const std::string& tokenName = "");

    std::optional<android::gui::FocusRequest> getFocusRequest(ui::LogicalDisplayId displayId);



    std::string dumpFocusedWindows() const;

};



} // namespace android::inputdispatcher

services/inputflinger/dispatcher/InputDispatcher.cpp

+0 −9
Original line number Diff line number Diff line
@@ -5734,15 +5734,6 @@ void InputDispatcher::setFocusedDisplay(ui::LogicalDisplayId displayId) { 
            // Find new focused window and validate

            sp<IBinder> newFocusedWindowToken = mFocusResolver.getFocusedWindowToken(displayId);

            sendFocusChangedCommandLocked(oldFocusedWindowToken, newFocusedWindowToken);



            if (newFocusedWindowToken == nullptr) {

                ALOGW("Focused display #%s does not have a focused window.",

                      displayId.toString().c_str());

                if (mFocusResolver.hasFocusedWindowTokens()) {

                    ALOGE("But another display has a focused window\n%s",

                          mFocusResolver.dumpFocusedWindows().c_str());

                }

            }

        }

    } // release lock