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

Commit a6c2e3f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev

parents 3ba95852 90e0fe39

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

+11 −7
Original line number Diff line number Diff line
@@ -984,7 +984,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
     */

    public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {

        int runningTaskViewId = getTaskViewIdFromTaskId(taskId);

        if (mRunningTaskViewId != -1 && mRunningTaskViewId == runningTaskViewId) {

        if (mRunningTaskViewId == -1 ||

                mRunningTaskViewId != runningTaskViewId ||

                mRemoteTargetHandles == null) {

            return;

        }



        TransformParams params = mRemoteTargetHandles[0].getTransformParams();

        RemoteAnimationTargets targets = params.getTargetSet();

        if (targets != null && targets.findTask(taskId) != null) {
@@ -992,7 +997,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                    targets.nonApps);

        }

    }

    }



    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps,

            RemoteAnimationTargetCompat[] wallpaper, RemoteAnimationTargetCompat[] nonApps) {