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

Commit fa72529b authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Check if live tile targetSet is null in... 

Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev
parents 6788b739 d2039614

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

+5 −3
Original line number Diff line number Diff line
@@ -863,10 +863,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
    }



    public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {

        if (mRunningTaskId != -1 && mRunningTaskId == taskId &&

                getLiveTileParams().getTargetSet().findTask(taskId) != null) {

        if (mRunningTaskId != -1 && mRunningTaskId == taskId) {

            RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();

            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps);

            if (targets != null && targets.findTask(taskId) != null) {

                launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers,

                        targets.nonApps);

            }

        }

    }