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

Commit 493baa12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "RESTRICT AUTOMERGE Avoid the scenario Where taskdisplayarea is null"

parents c875fc56 26d8e9e8

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

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

                ? r.getTask()

                : mTargetTask;

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

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

            return;

        }