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

Commit c3834d23 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TaskDisplayArea: fix NPE problem." into main am: bd9903f6 am: aa47bd5e 

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



Change-Id: I3465e8a7fbbd93a024d0df6e805002a85c09ec25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e47099a6 aa47bd5e

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

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
     */

    void positionTaskBehindHome(Task task) {

        final Task home = getOrCreateRootHomeTask();

        final WindowContainer homeParent = home.getParent();

        final WindowContainer homeParent = home != null ? home.getParent() : null;

        final Task homeParentTask = homeParent != null ? homeParent.asTask() : null;

        if (homeParentTask == null) {

            // reparent throws if parent didn't change...