commit 4f2dd40cd731a52debecedbef845c2d6e2de5e06
author chaviw <chaviw@google.com> Wed Dec 26 15:30:27 2018 -0800
committer Chavi Weingarten <chaviw@google.com> Thu Jan 10 16:45:20 2019 +0000
tree 28fd67cc19dad7014363c50f88018630433608df
parent bcb4be70fab707a300c1a83920805e984fcb49b8

Fix drag and drop (3/3)

Remove reference to old transferTouchInput that was used from InputManager

Test: Builds
Bug: 120463595
Change-Id: Id7cb864fdec898fc1a2a4b90245efe2187c72031

services/inputflinger/InputDispatcher.cpp

diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp
index 7997928..8e3aa5f 100644
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -3374,11 +3374,6 @@
     mLooper->wake();
 }
 
-bool InputDispatcher::transferTouchFocus(const sp<InputChannel>& fromChannel,
-        const sp<InputChannel>& toChannel) {
-    return transferTouchFocus(fromChannel->getToken(), toChannel->getToken());
-}
-
 bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) {
     if (fromToken == toToken) {
 #if DEBUG_FOCUS
@@ -3392,14 +3387,14 @@
 
         sp<InputWindowHandle> fromWindowHandle = getWindowHandleLocked(fromToken);
         sp<InputWindowHandle> toWindowHandle = getWindowHandleLocked(toToken);
-#if DEBUG_FOCUS
-        ALOGD("transferTouchFocus: fromWindowHandle=%s, toWindowHandle=%s",
-            fromWindowHandle->getName().c_str(), toWindowHandle->getName().c_str());
-#endif
         if (fromWindowHandle == nullptr || toWindowHandle == nullptr) {
             ALOGW("Cannot transfer focus because from or to window not found.");
             return false;
         }
+#if DEBUG_FOCUS
+        ALOGD("transferTouchFocus: fromWindowHandle=%s, toWindowHandle=%s",
+            fromWindowHandle->getName().c_str(), toWindowHandle->getName().c_str());
+#endif
         if (fromWindowHandle->getInfo()->displayId != toWindowHandle->getInfo()->displayId) {
 #if DEBUG_FOCUS
             ALOGD("Cannot transfer focus because windows are on different displays.");

services/inputflinger/InputDispatcher.h

diff --git a/services/inputflinger/InputDispatcher.h b/services/inputflinger/InputDispatcher.h
index 970632e..41f7dee 100644
--- a/services/inputflinger/InputDispatcher.h
+++ b/services/inputflinger/InputDispatcher.h
@@ -349,9 +349,6 @@
      */
     virtual bool transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) = 0;
 
-    virtual bool transferTouchFocus(const sp<InputChannel>& fromChannel,
-            const sp<InputChannel>& toChannel) = 0;
-
     /* Registers input channels that may be used as targets for input events.
      * If inputWindowHandle is null, and displayId is not ADISPLAY_ID_NONE,
      * the channel will receive a copy of all input events form the specific displayId.
@@ -416,8 +413,6 @@
     virtual void setInputFilterEnabled(bool enabled);
 
     virtual bool transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken);
-    virtual bool transferTouchFocus(const sp<InputChannel>& fromChannel,
-            const sp<InputChannel>& toChannel);
 
     virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel,
             int32_t displayId);