Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev (bebfe779) · Commits · e / os / android_frameworks_base

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.