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

Commit 65d64a2d authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ideffd0a5a5d706eb317232dd8e4a440538ce911d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07131f87 c5bfa992

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }