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

Commit 29763861 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

Merge "Avoid the scenario Where taskdisplayarea is null" into sc-v2-dev am: 3767ba99 am: b56e8efc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15581985

Change-Id: Id44ea143e76b978c59447f782553d9827cd74671
parents 230c641b b56e8efc

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

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

                ? r.getTask()

                : mTargetTask;

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

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

            return;

        }