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

Commit adc109ca authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Null check RecentsView before calling launchSideTaskInLiveTileMode

Test: N/A
Fixes: 185066406
Change-Id: Ic85bbe02b93c7cc652543138d3ea79f7892c7268
parent 1b28e6d4
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) {