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

Don't inflate mSplitDecorManager in sync transaction callback

Browse Source 
The current code inflates the UI in the sync transaction callback. This
can result in a deadlock since inflate could block waiting on RT. The RT
could be blocked waiting for the sync transaction to get applied to free
up a buffer. But since the sync transaction won't get applied until after
the inflate, it would deadlock.

Test: Not stuck in split
Fixes: 231929473
Change-Id: I751aa2d68ec96f7f77ba4145d810cccf764075ea
This commit is contained in:
chaviw
2022-05-17 17:39:25 -05:00
parent 4304b4b031
commit 04efcbae29
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
View File

@@ -224,14 +224,12 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
if (mRootTaskInfo.taskId == taskInfo.taskId) {
// Inflates split decor view only when the root task is visible.
if (mRootTaskInfo.isVisible != taskInfo.isVisible) {
mSyncQueue.runInSync(t -> {
if (taskInfo.isVisible) {
mSplitDecorManager.inflate(mContext, mRootLeash,
taskInfo.configuration.windowConfiguration.getBounds());
} else {
mSplitDecorManager.release(t);
}
});
if (taskInfo.isVisible) {
mSplitDecorManager.inflate(mContext, mRootLeash,
taskInfo.configuration.windowConfiguration.getBounds());
} else {
mSyncQueue.runInSync(t -> mSplitDecorManager.release(t));
}
}
mRootTaskInfo = taskInfo;
} else if (taskInfo.parentTaskId == mRootTaskInfo.taskId) {