Merge "Correctly remove drag surface when perform drag failed" into udc-qpr-dev

2023-05-18 03:29:47 +00:00
parent 1ec573a039 86a32d0d4e
commit b67b54fc63
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/DragDropController.java
+++ b/services/core/java/com/android/server/wm/DragDropController.java
@@ -181,7 +181,11 @@ class DragDropController {
                    }
                } finally {
                    if (surface != null) {
-                        surface.release();
+                        try (final SurfaceControl.Transaction transaction =
+                                mService.mTransactionFactory.get()) {
+                            transaction.remove(surface);
+                            transaction.apply();
+                        }
                    }
                }
            }