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

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

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

Change-Id: Ideffd0a5a5d706eb317232dd8e4a440538ce911d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-10-10 02:47:16 +00:00
committed by Automerger Merge Worker
parent 07131f879e c5bfa99295
commit 65d64a2dc6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityRecord.java
View File

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