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

Commit e38d6d52 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... 

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

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



Change-Id: Ib71a4836cf1c1cf9905fa21f5e3ed10281314e46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6908999c 65d64a2d

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

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

    }