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

Commit 4859b30a authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness"... 

Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev am: bebfe779

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

Change-Id: Ia00d63d4383e4b50f57ef71ce43b23a7c451f549
parents 70dddda2 bebfe779

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

+4 −3
Original line number Diff line number Diff line
@@ -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.