diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 7d911bc049f0..69ad59a1668d 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -2969,14 +2969,15 @@ class Task extends TaskFragment { @Nullable ActivityRecord getOccludingActivityAbove(ActivityRecord activity) { final ActivityRecord top = getActivity(r -> { - if (!r.occludesParent()) { - return false; - } if (r == activity) { // Reached the given activity, return the activity to stop searching. return true; } + if (!r.occludesParent()) { + return false; + } + TaskFragment parent = r.getTaskFragment(); if (parent == activity.getTaskFragment()) { // Found it. This activity on top of the given activity on the same TaskFragment. |