Merge "Skip updating the leash if a task is removed prior to sync completion" into tm-qpr-dev (e2574c8d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener {
		}
		if (!createdWindowDecor) {
		mSyncQueue.runInSync(t -> {
		if (!leash.isValid()) {
		// Task vanished before sync completion
		return;
		}
		// Reset several properties back to fullscreen (PiP, for example, leaves all these
		// properties in a bad state).
		t.setWindowCrop(leash, null);
		@@ -136,6 +140,10 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener {
		final Point positionInParent = state.mTaskInfo.positionInParent;
		if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) {
		mSyncQueue.runInSync(t -> {
		if (!state.mLeash.isValid()) {
		// Task vanished before sync completion
		return;
		}
		t.setPosition(state.mLeash, positionInParent.x, positionInParent.y);
		});
		}