Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-qpr-dev (34ffe6d5) · Commits · e / os / android_frameworks_base

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+8 −6

Original line number	Diff line number	Diff line
		@@ -523,9 +523,10 @@ class ActivityLaunchAnimator(
		state: LaunchAnimator.State,
		linearProgress: Float,
		) {
		if (transactionApplierView.viewRootImpl == null) {
		// If the view root we synchronize with was detached, don't apply any transaction
		// (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw).
		if (transactionApplierView.viewRootImpl == null \|\| !window.leash.isValid) {
		// Don't apply any transaction if the view root we synchronize with was detached or
		// if the SurfaceControl associated with [window] is not valid, as
		// [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.
		return
		}

		@@ -605,9 +606,10 @@ class ActivityLaunchAnimator(
		state: LaunchAnimator.State,
		linearProgress: Float
		) {
		if (transactionApplierView.viewRootImpl == null) {
		// If the view root we synchronize with was detached, don't apply any transaction
		// (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw).
		if (transactionApplierView.viewRootImpl == null \|\| !navigationBar.leash.isValid) {
		// Don't apply any transaction if the view root we synchronize with was detached or
		// if the SurfaceControl associated with [navigationBar] is not valid, as
		// [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.
		return
		}