Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I3d210caa7b15c24eaf523207e4905b20a2894260
Change-Id: Ic3c8148937e940a0258e790ff89463dae79e992c

1 files changed, 3 insertions, 4 deletions

diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 11b27a214984..78d7d3a7051b 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -25,6 +25,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/thread_annotations.h>
 #include <ftl/enum.h>
+#include <input/PrintTools.h>
 
 #include <mutex>
 
@@ -137,10 +138,6 @@ std::mutex& PointerController::getLock() const {
     return mDisplayInfoListener->mLock;
 }
 
-std::optional<FloatRect> PointerController::getBounds() const {
-    return mCursorController.getBounds();
-}
-
 void PointerController::move(float deltaX, float deltaY) {
     const ui::LogicalDisplayId displayId = mCursorController.getDisplayId();
     vec2 transformed;
@@ -353,6 +350,8 @@ std::string PointerController::dump() {
     for (const auto& [_, spotController] : mLocked.spotControllers) {
         spotController.dump(dump, INDENT3);
     }
+    dump += INDENT2 "Cursor Controller:\n";
+    dump += addLinePrefix(mCursorController.dump(), INDENT3);
     return dump;
 }