From b41c21995f6a8ff23dd006f278fd87ecb99f40a2 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Wed, 6 Sep 2023 00:48:22 +0000 Subject: Addressed missed comments from ag/24539449 The CL with Change-ID Ib6b124db4108d11260b220cc57444007b9d865a6 was submitted before all reviewers had a chance to take a look. Addressing missed comments here. Bug: 293587049 Bug: 278783893 Test: presubmit Change-Id: I2946c0216935a35af05a3f74f1e2a5bd8e23fed1 --- libs/input/PointerController.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/input/PointerController.cpp') diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index c41cd0467ed3..abd928486607 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -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 -- cgit v1.2.3-59-g8ed1b