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

Commit 2256afcb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PIP2] Fix NPE for onSwipePipToHomeAnimation" into main

parents 70e17dfd de164ba7

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java

+4 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class PipController implements ConfigurationChangeListener, 
    private final List<Consumer<Boolean>> mOnIsInPipStateChangedListeners = new ArrayList<>();



    // Wrapper for making Binder calls into PiP animation listener hosted in launcher's Recents.

    private PipAnimationListener mPipRecentsAnimationListener;

    @Nullable private PipAnimationListener mPipRecentsAnimationListener;



    @VisibleForTesting

    interface PipAnimationListener {
@@ -378,8 +378,10 @@ public class PipController implements ConfigurationChangeListener, 
            tx.setLayer(overlay, Integer.MAX_VALUE);

            tx.apply();

        }

        if (mPipRecentsAnimationListener != null) {

            mPipRecentsAnimationListener.onPipAnimationStarted();

        }

    }



    private void setLauncherKeepClearAreaHeight(boolean visible, int height) {

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,