commit 2dec43c2c187cb240af0b01220f7ad69cae8f866
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 04 22:20:19 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 04 22:20:19 2024 +0000
tree 8ea52f073dd3e87206b0598c0f0051ead9e348a8
parent ca44e3aa8e4153212f54404cefaf2b2d8f259a9a
parent 58bb72b6fe8c5717bb7e8ab3112257209312f0f1

Merge "DragState: fix the NPE problem." into main

services/core/java/com/android/server/wm/DragState.java

diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index 2a5a3a5..1c4e487 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -528,7 +528,7 @@
             }
             // Only allow the extras to be dispatched to a global-intercepting drag target
             ClipData data = null;
-            if (interceptsGlobalDrag) {
+            if (interceptsGlobalDrag && mData != null) {
                 data = mData.copyForTransferWithActivityInfo();
                 PersistableBundle extras = data.getDescription().getExtras() != null
                         ? data.getDescription().getExtras()