summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prabir Pradhan <prabirmsp@google.com> 2024-09-18 14:01:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-09-18 14:01:34 +0000
commit0557475c264a2f20c7357165ae54fab79b1c2054 (patch)
tree0d250280824abdb7fc41a03fd5f8c5b01fd76e2b
parentca1fefc36925b29ef2c2ad4050334b1e16db33c7 (diff)
parent691afb4d14ee90e49fdfdae53a377f38b87c9b17 (diff)
Merge "Cleanup PointerControllerInterface: Remove unused getBounds method" into main
-rw-r--r--services/inputflinger/include/PointerControllerInterface.h4
-rw-r--r--services/inputflinger/tests/FakePointerController.cpp6
-rw-r--r--services/inputflinger/tests/FakePointerController.h1
3 files changed, 0 insertions, 11 deletions
diff --git a/services/inputflinger/include/PointerControllerInterface.h b/services/inputflinger/include/PointerControllerInterface.h
index e34ed0fbd8..8f3d9ca778 100644
--- a/services/inputflinger/include/PointerControllerInterface.h
+++ b/services/inputflinger/include/PointerControllerInterface.h
@@ -72,10 +72,6 @@ public:
/* Dumps the state of the pointer controller. */
virtual std::string dump() = 0;
- /* Gets the bounds of the region that the pointer can traverse.
- * Returns true if the bounds are available. */
- virtual std::optional<FloatRect> getBounds() const = 0;
-
/* Move the pointer. */
virtual void move(float deltaX, float deltaY) = 0;
diff --git a/services/inputflinger/tests/FakePointerController.cpp b/services/inputflinger/tests/FakePointerController.cpp
index d0998ba851..887a939e09 100644
--- a/services/inputflinger/tests/FakePointerController.cpp
+++ b/services/inputflinger/tests/FakePointerController.cpp
@@ -148,12 +148,6 @@ bool FakePointerController::isPointerShown() {
return mIsPointerShown;
}
-std::optional<FloatRect> FakePointerController::getBounds() const {
- if (!mEnabled) return std::nullopt;
-
- return mHaveBounds ? std::make_optional<FloatRect>(mMinX, mMinY, mMaxX, mMaxY) : std::nullopt;
-}
-
void FakePointerController::move(float deltaX, float deltaY) {
if (!mEnabled) return;
diff --git a/services/inputflinger/tests/FakePointerController.h b/services/inputflinger/tests/FakePointerController.h
index 2c76c6214c..9b773a7715 100644
--- a/services/inputflinger/tests/FakePointerController.h
+++ b/services/inputflinger/tests/FakePointerController.h
@@ -65,7 +65,6 @@ public:
private:
std::string dump() override { return ""; }
- std::optional<FloatRect> getBounds() const override;
void move(float deltaX, float deltaY) override;
void unfade(Transition) override;
void setPresentation(Presentation) override {}