Merge "Update running remote animation state after activity change" into tm-dev (bad9a217) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -304,10 +304,6 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
		mService.stopAppSwitches();
		}

		if (mCaller != null) {
		mCaller.setRunningRecentsAnimation(false);
		}

		mWindowManager.inSurfaceTransaction(() -> {
		Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER,
		"RecentsAnimation#onAnimationFinished_inSurfaceTransaction");
		@@ -413,6 +409,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
		if (mWindowManager.mRoot.isLayoutNeeded()) {
		mWindowManager.mRoot.performSurfacePlacement();
		}
		if (mCaller != null) {
		mCaller.setRunningRecentsAnimation(false);
		}
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		}
		});