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

Commit 9b407c6d authored by Iris Yang's avatar Iris Yang Committed by Automerger Merge Worker
Browse files

Merge "Post callback onSecureWindowShown on the main thread" into tm-qpr-dev am: d093418a 

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



Change-Id: Ia9bf3d243bf2fed33ea8139fd09bc5ec895aca87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37705543 d093418a

services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java

+3 −1
Original line number Diff line number Diff line
@@ -250,7 +250,9 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
        // The callback is fired only when windowFlags are changed. To let VirtualDevice owner

        // aware that the virtual display has a secure window on top.

        if ((windowFlags & FLAG_SECURE) != 0) {

            mSecureWindowCallback.onSecureWindowShown(mDisplayId, activityInfo.applicationInfo.uid);

            // Post callback on the main thread, so it doesn't block activity launching.

            mHandler.post(() -> mSecureWindowCallback.onSecureWindowShown(mDisplayId,

                    activityInfo.applicationInfo.uid));

        }



        if (!canContainActivity(activityInfo, windowFlags, systemWindowFlags)) {