commit 381625d95f575c32ee5b675af77b7c6d7c9676b7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 25 21:00:12 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 25 21:00:12 2024 -0800
tree 20be60b3e31f54337cd675a320764100ef7a167c
parent bd9903f65607af49347125996e222627b7dd91d5
parent 9989d67752ae992b6cebf6c5f019dcb8dddd0a55

Merge "remove the wms lock in notifyMovementBoundsChanged method." into main

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

diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index 42ea5a8..83d08cc 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -843,7 +843,7 @@
      */
     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...