diff options
| author | 2018-12-26 15:30:27 -0800 | |
|---|---|---|
| committer | 2019-01-10 16:45:20 +0000 | |
| commit | 4f2dd40cd731a52debecedbef845c2d6e2de5e06 (patch) | |
| tree | 28fd67cc19dad7014363c50f88018630433608df /services/inputflinger/InputDispatcher.cpp | |
| parent | bcb4be70fab707a300c1a83920805e984fcb49b8 (diff) | |
Fix drag and drop (3/3)
Remove reference to old transferTouchInput that was used from InputManager
Test: Builds
Bug: 120463595
Change-Id: Id7cb864fdec898fc1a2a4b90245efe2187c72031
Diffstat (limited to 'services/inputflinger/InputDispatcher.cpp')
| -rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 7997928624..8e3aa5fd2f 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -3374,11 +3374,6 @@ void InputDispatcher::setInputFilterEnabled(bool enabled) { 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 @@ bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp< 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."); |