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

Merge "Copy leashes about to return to prevent others release them" into rvc-dev

Browse Source
This commit is contained in:
Tiger Huang
2020-04-21 16:09:23 +00:00
committed by Android (Google) Code Review
parent 81b99eda9b 9629242dd4
commit d4ec66b4f3
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2446,17 +2446,15 @@ public class WindowManagerService extends IWindowManager.Stub
if (controls != null) { if (controls != null) {
final int length = Math.min(controls.length, outControls.length); final int length = Math.min(controls.length, outControls.length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
final InsetsSourceControl control = controls[i]; // We will leave the critical section before returning the leash to the client,
// so we need to copy the leash to prevent others release the one that we are
// Check if we are sending invalid leashes. // about to return.
final SurfaceControl leash = control != null ? control.getLeash() : null; // TODO: We will have an extra copy if the client is not local.
if (leash != null && !leash.isValid()) { // For now, we rely on GC to release it.
Slog.wtf(TAG, leash + " is not valid before sending to " + win, // Maybe we can modify InsetsSourceControl.writeToParcel so it can release
leash.getReleaseStack()); // the extra leash as soon as possible.
} outControls[i] = controls[i] != null
? new InsetsSourceControl(controls[i]) : null;
outControls[i] = win.isClientLocal() && control != null
? new InsetsSourceControl(control) : control;
} }
} }
} }