Merge "Add null-check before reparenting content overlay" into tm-dev (c3b917ad) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		}
		mPipBoundsState.setBounds(destinationBounds);
		mSwipePipToHomeOverlay = overlay;
		if (ENABLE_SHELL_TRANSITIONS) {
		if (ENABLE_SHELL_TRANSITIONS && overlay != null) {
		// With Shell transition, the overlay was attached to the remote transition leash, which
		// will be removed when the current transition is finished, so we need to reparent it
		// to the actual Task surface now.