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

Commit 3767ba99 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid the scenario Where taskdisplayarea is null" into sc-v2-dev

parents 53719f8b 8e4db8ed

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1509,7 +1509,7 @@ class ActivityStarter { 
        final Task targetTask = r.getTask() != null

        final Task targetTask = r.getTask() != null

                ? r.getTask()

                ? r.getTask()

                : mTargetTask;

                : mTargetTask;

        if (startedActivityRootTask == null || targetTask == null) {

        if (startedActivityRootTask == null || targetTask == null || !targetTask.isAttached()) {

            return;

            return;

        }

        }