Merge "applySyncTransaction: Add to syncSet earlier" into rvc-dev (3f1696a3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowOrganizerController.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -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();