commit bdf936984acca93aea3ef94fdbd42830a697ca58
author Prabir Pradhan <prabirmsp@google.com> Tue Jan 23 18:08:28 2024 +0000
committer Prabir Pradhan <prabirmsp@google.com> Tue Jan 23 18:08:28 2024 +0000
tree e41c5dfdbde5f8436d73d6b9d5b36d0b7ce92736
parent 37c1b992d923106d79f4b299b2661a5fde0892cc

PointerController: Simplify display info listener registration

Bug: 313033164
Test: Presubmit
Change-Id: I71e4943d36e0e3b5b0c9eaaaef7c8d04a82ba90d

libs/input/PointerController.cpp

diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 1604ba2..f84107e 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -115,7 +115,7 @@
                                                       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 @@
         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

diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h
index 8daa3a3..6ee5707 100644
--- a/libs/input/PointerController.h
+++ b/libs/input/PointerController.h
@@ -79,9 +79,8 @@
     std::string dump() override;
 
 protected:
-    using WindowListenerRegisterConsumer =
-            std::function<std::pair<std::vector<gui::WindowInfo>, std::vector<gui::DisplayInfo>>(
-                    const sp<android::gui::WindowInfosListener>&)>;
+    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

diff --git a/libs/input/tests/PointerController_test.cpp b/libs/input/tests/PointerController_test.cpp
index 45b426b..a1bb5b3 100644
--- a/libs/input/tests/PointerController_test.cpp
+++ b/libs/input/tests/PointerController_test.cpp
@@ -161,8 +161,7 @@
                     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 {};