Merge "[Bugfix] Fix the issue of transition animation splash screen in split screen mode." (06654903) · Commits · e / os / android_frameworks_base

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

+15 −7

Original line number	Diff line number	Diff line
		@@ -1343,13 +1343,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		final Task rootTask = getRootTask();

		// If we reparent, make sure to remove ourselves from the old animation registry.
		if (mAnimatingActivityRegistry != null) {
		mAnimatingActivityRegistry.notifyFinished(this);
		}
		mAnimatingActivityRegistry = rootTask != null
		? rootTask.getAnimatingActivityRegistry()
		: null;
		updateAnimatingActivityRegistry();

		if (task == mLastParentBeforePip) {
		// Activity's reparented back from pip, clear the links once established
		@@ -1373,6 +1367,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		}

		void updateAnimatingActivityRegistry() {
		final Task rootTask = getRootTask();
		final AnimatingActivityRegistry registry = rootTask != null
		? rootTask.getAnimatingActivityRegistry()
		: null;

		// If we reparent, make sure to remove ourselves from the old animation registry.
		if (mAnimatingActivityRegistry != null && mAnimatingActivityRegistry != registry) {
		mAnimatingActivityRegistry.notifyFinished(this);
		}

		mAnimatingActivityRegistry = registry;
		}

		/**
		* Sets {@link #mLastParentBeforePip} to the current parent Task, it's caller's job to ensure
		* {@link #getTask()} is set before this is called.

+3 −0

Original line number	Diff line number	Diff line
		@@ -1464,6 +1464,9 @@ class Task extends WindowContainer<WindowContainer> {
		adjustBoundsForDisplayChangeIfNeeded(getDisplayContent());

		mRootWindowContainer.updateUIDsPresentOnDisplay();

		// Ensure all animations are finished at same time in split-screen mode.
		forAllActivities(ActivityRecord::updateAnimatingActivityRegistry);
		}

		void cleanUpActivityReferences(ActivityRecord r) {