diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskFragment.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 22df8b06e398..324f0296c5dd 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -103,7 +103,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Objects; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; @@ -1758,7 +1757,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { final Task task = isAddingActivity ? getTask() : null; // If this task had any activity before we added this one. - boolean taskHadActivity = task != null && task.getActivity(Objects::nonNull) != null; + boolean taskHadActivity = task != null && task.getTopMostActivity() != null; // getActivityType() looks at the top child, so we need to read the type before adding // a new child in case the new child is on top and UNDEFINED. final int activityType = task != null ? task.getActivityType() : ACTIVITY_TYPE_UNDEFINED; @@ -2171,7 +2170,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) { return applicationType; } - final ActivityRecord activity = getTopNonFinishingActivity(); + final ActivityRecord activity = getTopMostActivity(); return activity != null ? activity.getActivityType() : getTopChild().getActivityType(); } |