summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Helen Cheuk <helencheuk@google.com> 2025-03-14 04:05:23 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-14 04:05:23 -0700
commit8b408e4767b3c2132b1339cbdc297bc20d68ea2f (patch)
tree3d3510f55920d08226879cedca11d8db849d3e53 /src
parent53cb4f2b427939da79c94ef3753068e6d0900f76 (diff)
parentde869b3624f07f2b17bf6f2ac8c840b9da4dc573 (diff)
Merge "Check null when getting drop view in DragController" into main
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/dragndrop/DragController.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 284faba9da..415a2c6230 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -544,9 +544,10 @@ public abstract class DragController<T extends ActivityContext>
}
accepted = true;
}
+
+ final View dropTargetAsView = dropTarget.getDropView();
+ dispatchDropComplete(dropTargetAsView, accepted);
}
- final View dropTargetAsView = dropTarget.getDropView();
- dispatchDropComplete(dropTargetAsView, accepted);
}
private DropTarget findDropTarget(final int x, final int y) {