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

Commit 1e09d0e4 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev

parents b0815a51 a2ee83db

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

+1 −1
Original line number Diff line number Diff line
@@ -5438,7 +5438,7 @@ class ActivityStack extends ConfigurationContainer { 
            if (isAttached()) {

                getDisplay().positionChildAtBottom(this);

            }

            if (!isActivityTypeHome() || getDisplay().isRemoved()) {

            if (!isActivityTypeHome() || !isAttached()) {

                remove();

            }

        }