commit 367f3436bf3a8d87612324596ad3c6266e1bbe43
author Prabir Pradhan <prabirmsp@google.com> Tue Feb 13 23:05:58 2024 +0000
committer Prabir Pradhan <prabirmsp@google.com> Wed Feb 14 17:16:05 2024 +0000
tree c886eabb0ba04ff67fd56904999576c5354ff957
parent 65455c7f7ee20a68dffe6fdb569aecfa63c7d243

InputDispatcher: Rename transferTouch APIs

Rename the old 'transferTouchFocus' API to 'transferTouchGesture' to
avoid confusion with window focus. The old 'transferTouch' method is
deprecated, and is named 'transferTouchOnDisplay'.

Bug: 324265767
Test: build
Change-Id: I97b3cbf4522cc66c3b277f516e8aab296167d23d

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 3a18f25..8d43f3b 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -5562,8 +5562,8 @@
     return std::make_tuple(nullptr, nullptr, ADISPLAY_ID_DEFAULT);
 }
 
-bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken,
-                                         bool isDragDrop) {
+bool InputDispatcher::transferTouchGesture(const sp<IBinder>& fromToken, const sp<IBinder>& toToken,
+                                           bool isDragDrop) {
     if (fromToken == toToken) {
         if (DEBUG_FOCUS) {
             ALOGD("Trivial transfer to same window.");
@@ -5597,7 +5597,7 @@
         }
 
         if (DEBUG_FOCUS) {
-            ALOGD("transferTouchFocus: fromWindowHandle=%s, toWindowHandle=%s",
+            ALOGD("%s: fromWindowHandle=%s, toWindowHandle=%s", __func__,
                   touchedWindow->windowHandle->getName().c_str(),
                   toWindowHandle->getName().c_str());
         }
@@ -5683,7 +5683,8 @@
 }
 
 // Binder call
-bool InputDispatcher::transferTouch(const sp<IBinder>& destChannelToken, int32_t displayId) {
+bool InputDispatcher::transferTouchOnDisplay(const sp<IBinder>& destChannelToken,
+                                             int32_t displayId) {
     sp<IBinder> fromToken;
     { // acquire lock
         std::scoped_lock _l(mLock);
@@ -5703,7 +5704,7 @@
         fromToken = from->getToken();
     } // release lock
 
-    return transferTouchFocus(fromToken, destChannelToken);
+    return transferTouchGesture(fromToken, destChannelToken);
 }
 
 void InputDispatcher::resetAndDropEverythingLocked(const char* reason) {