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

Commit bdf93698 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

PointerController: Simplify display info listener registration 

Bug: 313033164
Test: Presubmit
Change-Id: I71e4943d36e0e3b5b0c9eaaaef7c8d04a82ba90d
parent 37c1b992

libs/input/PointerController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& 
                                                      std::vector<android::gui::DisplayInfo>{});

                    SurfaceComposerClient::getDefault()->addWindowInfosListener(listener,

                                                                                &initialInfo);

                    return initialInfo;

                    return initialInfo.second;

                },

                [](const sp<android::gui::WindowInfosListener>& listener) {

                    SurfaceComposerClient::getDefault()->removeWindowInfosListener(listener);
@@ -133,7 +133,7 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& 
        mUnregisterWindowInfosListener(std::move(unregisterListener)) {

    std::scoped_lock lock(getLock());

    mLocked.presentation = Presentation::SPOT;

    const auto& [_, initialDisplayInfos] = registerListener(mDisplayInfoListener);

    const auto& initialDisplayInfos = registerListener(mDisplayInfoListener);

    onDisplayInfosChangedLocked(initialDisplayInfos);

}

libs/input/PointerController.h

+2 −3
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ public: 
    std::string dump() override;



protected:

    using WindowListenerRegisterConsumer =

            std::function<std::pair<std::vector<gui::WindowInfo>, std::vector<gui::DisplayInfo>>(

    using WindowListenerRegisterConsumer = std::function<std::vector<gui::DisplayInfo>(

            const sp<android::gui::WindowInfosListener>&)>;

    using WindowListenerUnregisterConsumer =

            std::function<void(const sp<android::gui::WindowInfosListener>&)>;

libs/input/tests/PointerController_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ public: 
                    policy, looper, spriteController,

                    /*enabled=*/true,

                    [&registeredListener](const sp<android::gui::WindowInfosListener>& listener)

                            -> std::pair<std::vector<gui::WindowInfo>,

                                         std::vector<gui::DisplayInfo>> {

                            -> std::vector<gui::DisplayInfo> {

                        // Register listener

                        registeredListener = listener;

                        return {};