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

Commit 1d6058c2 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Null out mRemoteTargetHandles when swiping to home 

* Also all null check when trying to show divider
after swipe down animation from overview

Fixes: 223946009
Test: Steps in bug no longer cause crash
Change-Id: I2c8484c37b863c4cb6aba7e274c1eb76bce92b4a
parent 8d06bb89

quickstep/src/com/android/quickstep/FallbackSwipeHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ public class FallbackSwipeHandler extends 
        } else {

            recentsCallback = callback;

        }

        mRecentsView.cleanupRemoteTargets();

        mRecentsAnimationController.finish(

                mAppCanEnterPip /* toRecents */, recentsCallback, true /* sendUserLeaveHint */);

    }

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ public class LauncherSwipeHandlerV2 extends 


    @Override

    protected void finishRecentsControllerToHome(Runnable callback) {

        mRecentsView.cleanupRemoteTargets();

        mRecentsAnimationController.finish(

                true /* toRecents */, callback, true /* sendUserLeaveHint */);

    }

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -4283,7 +4283,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

        mPendingAnimation.addEndListener(isSuccess -> {

            if (isSuccess) {

                if (tv.getTaskIds()[1] != -1) {

                if (tv.getTaskIds()[1] != -1 && mRemoteTargetHandles != null) {

                    // TODO(b/194414938): make this part of the animations instead.

                    TaskViewUtils.createSplitAuxiliarySurfacesAnimator(

                            mRemoteTargetHandles[0].getTransformParams().getTargetSet().nonApps,