commit 676ea210811eca68b03db752d4dab5a5ba9f6c8a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 02 04:49:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 02 04:49:44 2019 +0000
tree a46cf729876d8e91abe166ccf988ded9556ab3f1
parent c4d27393e82f460422765d9418a458707ce9247f
parent cf09181b88e5bd20730e9c4f959d87b36456ee16

Merge "Release input surface of drag completely"

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 553b0ff..c8f7af5 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -147,12 +147,6 @@
         return mIsClosing;
     }
 
-    private void hideInputSurface() {
-        if (mInputSurface != null) {
-            mTransaction.hide(mInputSurface).apply();
-        }
-    }
-
     private void showInputSurface() {
         if (mInputSurface == null) {
             mInputSurface = mService.makeSurfaceBuilder(
@@ -198,8 +192,6 @@
             mInputInterceptor = null;
         }
 
-        hideInputSurface();
-
         // Send drag end broadcast if drag start has been sent.
         if (mDragInProgress) {
             final int myPid = Process.myPid();
@@ -239,6 +231,10 @@
         }
 
         // Clear the internal variables.
+        if (mInputSurface != null) {
+            mTransaction.remove(mInputSurface).apply();
+            mInputSurface = null;
+        }
         if (mSurfaceControl != null) {
             mTransaction.reparent(mSurfaceControl, null).apply();
             mSurfaceControl = null;