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

Merge "applySyncTransaction: Add to syncSet earlier" into rvc-dev am: 3f1696a389 am: f69609d2cf

Browse Source 
Change-Id: I56da2d38e41863547409812b5df890bb396a5704
This commit is contained in:
TreeHugger Robot
2020-05-14 01:41:45 +00:00
committed by Automerger Merge Worker
parent 52c36113ab f69609d2cf
commit ea5622ada8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -138,6 +138,13 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
Slog.e(TAG, "Attempt to operate on detached container: " + wc);
continue;
}
// Make sure we add to the syncSet before performing
// operations so we don't end up splitting effects between the WM
// pending transaction and the BLASTSync transaction.
if (syncId >= 0) {
mBLASTSyncEngine.addToSyncSet(syncId, wc);
}
int containerEffect = applyWindowContainerChange(wc, entry.getValue());
effects |= containerEffect;
@@ -146,9 +153,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
&& (containerEffect & TRANSACT_EFFECTS_CLIENT_CONFIG) != 0) {
haveConfigChanges.add(wc);
}
if (syncId >= 0) {
mBLASTSyncEngine.addToSyncSet(syncId, wc);
}
}
// Hierarchy changes
final List<WindowContainerTransaction.HierarchyOp> hops = t.getHierarchyOps();