Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iee7a83c6de6e097bf8018c776a2009afb731a58f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-12 02:37:23 +00:00
committed by Automerger Merge Worker
parent 35ebe0d719 a5e6d1e6b3
commit 67b062cdf1
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

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

7
services/core/java/com/android/server/wm/ActivityRecordInputSink.java
View File

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