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

Commit e0758040 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "Addressed missed comments from ag/24539449" into main

parents 9402275c b41c2199

libs/input/PointerController.cpp

+4 −4
Original line number Diff line number Diff line
@@ -354,13 +354,12 @@ const ui::Transform& PointerController::getTransformForDisplayLocked(int display 
    return it != di.end() ? it->transform : kIdentityTransform;

}



void PointerController::dump(std::string& dump) {

std::string PointerController::dump() {

    if (!mEnabled) {

        dump += INDENT "PointerController: DISABLED due to ongoing PointerChoreographer refactor\n";

        return;

        return INDENT "PointerController: DISABLED due to ongoing PointerChoreographer refactor\n";

    }



    dump += INDENT "PointerController:\n";

    std::string dump = INDENT "PointerController:\n";

    std::scoped_lock lock(getLock());

    dump += StringPrintf(INDENT2 "Presentation: %s\n",

                         ftl::enum_string(mLocked.presentation).c_str());
@@ -373,6 +372,7 @@ void PointerController::dump(std::string& dump) { 
    for (const auto& [_, spotController] : mLocked.spotControllers) {

        spotController.dump(dump, INDENT3);

    }

    return dump;

}



} // namespace android

libs/input/PointerController.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
    void onDisplayInfosChangedLocked(const std::vector<gui::DisplayInfo>& displayInfos)

            REQUIRES(getLock());



    void dump(std::string& dump);

    std::string dump();



protected:

    using WindowListenerConsumer =

services/core/jni/com_android_server_input_InputManagerService.cpp

+4 −5
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ public: 
    virtual void onPointerDisplayIdChanged(int32_t displayId, const FloatPoint& position);



    /* --- PointerControllerPolicyInterface implementation --- */

    virtual std::shared_ptr<PointerControllerInterface> createPointerController() override;

    std::shared_ptr<PointerControllerInterface> createPointerController() override;



private:

    sp<InputManagerInterface> mInputManager;
@@ -489,7 +489,7 @@ void NativeInputManager::dump(std::string& dump) { 
        dump += StringPrintf(INDENT "Pointer Capture: %s, seq=%" PRIu32 "\n",

                             mLocked.pointerCaptureRequest.enable ? "Enabled" : "Disabled",

                             mLocked.pointerCaptureRequest.seq);

        forEachPointerControllerLocked([&dump](PointerController& pc) { pc.dump(dump); });

        forEachPointerControllerLocked([&dump](PointerController& pc) { dump += pc.dump(); });

    } // release lock

    dump += "\n";
@@ -530,9 +530,8 @@ void NativeInputManager::setDisplayViewports(JNIEnv* env, jobjectArray viewportO 
    { // acquire lock

        std::scoped_lock _l(mLock);

        mLocked.viewports = viewports;

        forEachPointerControllerLocked([viewports = std::move(viewports)](PointerController& pc) {

            pc.onDisplayViewportsUpdated(viewports);

        });

        forEachPointerControllerLocked(

                [&viewports](PointerController& pc) { pc.onDisplayViewportsUpdated(viewports); });

    } // release lock



    mInputManager->getReader().requestRefreshConfiguration(