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

Commit 12c5785d authored by Jeff Chang's avatar Jeff Chang Committed by android-build-merger
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
am: ba6a7fa8

Change-Id: Iba81962a020dc274775b886287efc6ac20b93e8f
parents 1c5e44e9 ba6a7fa8

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

            }

        }