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

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

Merge "Null check RecentsView before calling launchSideTaskInLiveTileMode" into sc-dev

parents ea34ef9f adc109ca
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
@@ -61,11 +61,13 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
            if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                    && activityInterface.getCreatedActivity() != null) {
                RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();
                if (recentsView != null) {
                    recentsView.launchSideTaskInLiveTileModeForRestartedApp(task.taskId);
                    ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
                            mLiveTileRestartListener);
                }
            }
        }
    };

    TaskAnimationManager(Context ctx) {
@@ -135,11 +137,13 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
                        && activityInterface.getCreatedActivity() != null) {
                    RecentsView recentsView =
                            activityInterface.getCreatedActivity().getOverviewPanel();
                    if (recentsView != null) {
                        RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];
                        apps[0] = appearedTaskTarget;
                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);
                        return;
                    }
                }
                if (mController != null) {
                    if (mLastAppearedTaskTarget == null
                            || appearedTaskTarget.taskId != mLastAppearedTaskTarget.taskId) {