Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b889819a authored by Candice's avatar Candice
Browse files

Check the fullscreen magnification state onTransactionCommitted 

NullPointerException could happen when (1) create fullscreen
magnification border (2) remove fullscreen magnification (3) transaction
for creating border is committed and try to run animation on the border
view that has become null. Therefore, we should check the state before
performing animation.

Bug: 395005528
Test: atest FullscreenMagnificationControllerTest
Flag: EXEMPT BUGFIX
Change-Id: I7e7eff65db8cae583533a41b71965440d6f348f7
parent 91989f88

packages/SystemUI/src/com/android/systemui/accessibility/FullscreenMagnificationController.java

+7 −1
Original line number Diff line number Diff line
@@ -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)