Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix InputMonitor.updateInputWindowsLw

Browse Source 
Drag and drop (as well as window positioning by drag)
was broken by commit 6213caa. Drag-related window
handles got wiped out by a call to clearInputWindowHandlesLw.

Bug: 33499942
Test: cts-tradefed ... android.server.cts.CrossAppDragAndDropTests
Change-Id: I2504b1b6623fc8551c8110606c06156e49bfc63d
This commit is contained in:
Vladislav Kaznacheev
2016-12-13 14:31:24 -08:00
parent 99314b321a
commit 2e96c63c4c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -591,8 +591,6 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
private void updateInputWindows(boolean inDrag) {
clearInputWindowHandlesLw();
// TODO: multi-display
navInputConsumer = getInputConsumer(INPUT_CONSUMER_NAVIGATION, DEFAULT_DISPLAY);
pipInputConsumer = getInputConsumer(INPUT_CONSUMER_PIP, DEFAULT_DISPLAY);
@@ -614,6 +612,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
// Send windows to native code.
mService.mInputManager.setInputWindows(mInputWindowHandles);
clearInputWindowHandlesLw();
}
@Override