From 64809780ce12e9ed50fcb46ef0440dd5b8132104 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 10 May 2023 19:34:01 +0000 Subject: [PATCH] Revert "Fix null-pointers in SurfaceTransactionApplier constructor." This reverts commit d86c5657e0458cbc5674c9d76c3a93c773a55060. Reason for revert: b/281294745 Change-Id: Ib2680b60346a9bc5932057707d0ef105441f324d --- .../com/android/launcher3/QuickstepTransitionManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 0d5f5dfffa..45163cb0a8 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -1448,6 +1448,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener */ private Animator getFallbackClosingWindowAnimators(RemoteAnimationTarget[] appTargets) { final int rotationChange = getRotationChange(appTargets); + SurfaceTransactionApplier surfaceApplier = new SurfaceTransactionApplier(mDragLayer); Matrix matrix = new Matrix(); Point tmpPos = new Point(); Rect tmpRect = new Rect(); @@ -1503,7 +1504,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener .setAlpha(1f); } } - transaction.getTransaction().apply(); + surfaceApplier.scheduleApply(transaction); } }); @@ -1591,8 +1592,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener boolean playFallBackAnimation = (launcherView == null && launcherIsForceInvisibleOrOpening) || mLauncher.getWorkspace().isOverlayShown() - || hasMultipleTargetsWithMode(appTargets, MODE_CLOSING) - || mLauncher.isDestroyed(); + || hasMultipleTargetsWithMode(appTargets, MODE_CLOSING); boolean playWorkspaceReveal = true; boolean skipAllAppsScale = false;