Merge "Fix cross-app drag and drop" into nyc-dev

2016-02-17 21:43:30 +00:00
parent f269fd7fd5 7615130f55
commit bcac3bd744
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -10490,6 +10490,11 @@ public class WindowManagerService extends IWindowManager.Stub
                continue;
            }

+            child.getVisibleBounds(mTmpRect);
+            if (!mTmpRect.contains(x, y)) {
+                continue;
+            }
+
            child.getTouchableRegion(mTmpRegion);

            final int touchFlags = flags &