Merge "Fix CrossAppDragAndDropTests failed" into tm-dev

2022-06-07 13:31:55 +00:00
parent 0a194469f0 2d6b7b0af1
commit 1ae1828729
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/DragDropController.java
+++ b/services/core/java/com/android/server/wm/DragDropController.java
@@ -342,6 +342,11 @@ class DragDropController {
    }

    void reportDropWindow(IBinder token, float x, float y) {
+        if (mDragState == null) {
+            Slog.w(TAG_WM, "Drag state is closed.");
+            return;
+        }
+
        synchronized (mService.mGlobalLock) {
            mDragState.reportDropWindowLock(token, x, y);
        }