Merge "Check the fullscreen magnification state onTransactionCommitted" into main

1 files changed, 7 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/FullscreenMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/FullscreenMagnificationController.java
index b2f3df60c82b..d7bb667b02a9 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/FullscreenMagnificationController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/FullscreenMagnificationController.java
@@ -352,7 +352,13 @@ public class FullscreenMagnificationController implements ComponentCallbacks {
         mTransaction
                 .addTransactionCommittedListener(
                         mExecutor,
-                        this::showBorder)
+                        () -> {
+                            if (getState() == ENABLING) {
+                                // Ensure that we are in the ENABLING process to avoid performing
+                                // animation on a null view.
+                                mShowBorderRunnable.run();
+                            }
+                        })
                 .setPosition(mBorderSurfaceControl, -mBorderOffset, -mBorderOffset)
                 .setLayer(mBorderSurfaceControl, Integer.MAX_VALUE)
                 .show(mBorderSurfaceControl)