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

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

Merge changes from topic "presubmit-am-cc24ad26c93446a690f8a34ffde58aa3" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] Add null check for mRemoteTargetHandles for side task launch 2p: 90e0fe39
  Add null check for mRemoteTargetHandles for side task launch
parents 2f4f77fd 5c6173a8

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) {