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

Post reportDrawFinished to the UI thread if running in system

Browse Source 
If VRI is running in the system process, the call to finishDrawing will
not result in an IPC call and therefore will run on whatever thread
SurfaceSyncGroup finished on. This is normally going to be the
RenderThread. This could result in a deadlock because the finishDrawing
is now blocking any additional calls to RT, which is unexpected
behavior.

Instead, post to the UI thread when the VRI is running in system process
to ensure RT is unblocked.

Test: Presubmit
Bug: 286355097
Change-Id: Id8bd8eeced99f5228d7655382e0c043d03e0c196
This commit is contained in:
Chavi Weingarten
2023-06-22 18:20:11 +00:00
parent 87650418b0
commit 536973fda8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRootImpl.java
View File

@@ -3855,7 +3855,15 @@ public final class ViewRootImpl implements ViewParent,
mWmsRequestSyncGroupState = WMS_SYNC_PENDING;
mWmsRequestSyncGroup = new SurfaceSyncGroup("wmsSync-" + mTag, t -> {
mWmsRequestSyncGroupState = WMS_SYNC_MERGED;
reportDrawFinished(t, seqId);
// See b/286355097. If the current process is not system, then invoking finishDraw on
// any thread is fine since once it calls into system process, finishDrawing will run
// on a different thread. However, when the current process is system, the finishDraw in
// system server will be run on the current thread, which could result in a deadlock.
if (mWindowSession instanceof Binder) {
reportDrawFinished(t, seqId);
} else {
mHandler.postAtFrontOfQueue(() -> reportDrawFinished(t, seqId));
}
});
if (DEBUG_BLAST) {
Log.d(mTag, "Setup new sync=" + mWmsRequestSyncGroup.getName());