Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia00d63d4383e4b50f57ef71ce43b23a7c451f549
This commit is contained in:
Louis Chang
2021-08-04 16:42:53 +00:00
committed by Automerger Merge Worker
parent 70dddda2f3 bebfe77990
commit 4859b30a59
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/Task.java
View File

@@ -2969,14 +2969,15 @@ class Task extends TaskFragment {
@Nullable @Nullable
ActivityRecord getOccludingActivityAbove(ActivityRecord activity) { ActivityRecord getOccludingActivityAbove(ActivityRecord activity) {
final ActivityRecord top = getActivity(r -> { final ActivityRecord top = getActivity(r -> {
if (!r.occludesParent()) {
return false;
}
if (r == activity) { if (r == activity) {
// Reached the given activity, return the activity to stop searching. // Reached the given activity, return the activity to stop searching.
return true; return true;
} }
if (!r.occludesParent()) {
return false;
}
TaskFragment parent = r.getTaskFragment(); TaskFragment parent = r.getTaskFragment();
if (parent == activity.getTaskFragment()) { if (parent == activity.getTaskFragment()) {
// Found it. This activity on top of the given activity on the same TaskFragment. // Found it. This activity on top of the given activity on the same TaskFragment.