Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev

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

@@ -3967,6 +3967,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         } else {
             onRemovedFromDisplay();
         }
+        mActivityRecordInputSink.releaseSurfaceControl();
+
         super.removeImmediately();
     }
 

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

@@ -99,4 +99,11 @@ class ActivityRecordInputSink {
         return inputWindowHandle;
     }
 
+    void releaseSurfaceControl() {
+        if (mSurfaceControl != null) {
+            mSurfaceControl.release();
+            mSurfaceControl = null;
+        }
+    }
+
 }