Merge "Exclude finishing ActivityRecord when checking overlay" into tm-qpr-dev am: c5bfa99295 am: 65d64a2dc6

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

Change-Id: Ib71a4836cf1c1cf9905fa21f5e3ed10281314e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-10-10 03:22:18 +00:00
committed by Automerger Merge Worker

View File

@@ -5807,8 +5807,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// in untrusted mode. Traverse bottom to top with boundary so that it will only check
// activities above this activity.
final ActivityRecord differentUidOverlayActivity = getTask().getActivity(
a -> a.getUid() != getUid(), this /* boundary */, false /* includeBoundary */,
false /* traverseTopToBottom */);
a -> !a.finishing && a.getUid() != getUid(), this /* boundary */,
false /* includeBoundary */, false /* traverseTopToBottom */);
return differentUidOverlayActivity != null;
}