Merge "ActivityRecordInputSink: Ensure timely release of SurfaceControl" into tm-dev am: a5e6d1e6b3 am: 67b062cdf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694571

Change-Id: Ic9b104734c275092edc22ef232277e5582a6e5d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
+        }
+    }
+
 }