diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowOrganizerController.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 3f889c01bafb..8cd399f6a12e 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -1471,12 +1471,11 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub final int index = task.mChildren.indexOf(topTaskFragment); task.mChildren.remove(taskFragment); task.mChildren.add(index, taskFragment); - if (taskFragment.hasChild()) { - effects |= TRANSACT_EFFECTS_LIFECYCLE; - } else { + if (!taskFragment.hasChild()) { // Ensure that the child layers are updated if the TaskFragment is empty task.assignChildLayers(); } + effects |= TRANSACT_EFFECTS_LIFECYCLE; } } break; @@ -1491,12 +1490,11 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub if (task != null) { task.mChildren.remove(taskFragment); task.mChildren.add(0, taskFragment); - if (taskFragment.hasChild()) { - effects |= TRANSACT_EFFECTS_LIFECYCLE; - } else { + if (!taskFragment.hasChild()) { // Ensure that the child layers are updated if the TaskFragment is empty. task.assignChildLayers(); } + effects |= TRANSACT_EFFECTS_LIFECYCLE; } break; } @@ -1505,12 +1503,11 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub if (task != null) { task.mChildren.remove(taskFragment); task.mChildren.add(taskFragment); - if (taskFragment.hasChild()) { - effects |= TRANSACT_EFFECTS_LIFECYCLE; - } else { + if (!taskFragment.hasChild()) { // Ensure that the child layers are updated if the TaskFragment is empty. task.assignChildLayers(); } + effects |= TRANSACT_EFFECTS_LIFECYCLE; } break; } |