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

Commit ba6a7fa8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix NPE on ActivityStack.removeTask when launched with invalid... 

Merge "Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev am: 1e09d0e4" into qt-dev-plus-aosp
parents 931711ce dea1f713

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();

            }

        }