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

Commit dc890407 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Fix tap outside focus for SCVH from different process." into udc-dev am: 37f6a154 

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



Change-Id: I1ae453af76576d740941c437559206e8fca4924b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bba78470 37f6a154

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

+3 −1
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ class EmbeddedWindowController { 
        private void handleTap(boolean grantFocus) {

            if (mInputChannel != null) {

                if (mHostWindowState != null) {

                    mWmService.grantEmbeddedWindowFocus(mSession, mHostWindowState.mClient,

                    // Use null session since this is being granted by system server and doesn't

                    // require the host session to be passed in

                    mWmService.grantEmbeddedWindowFocus(null, mHostWindowState.mClient,

                            mFocusGrantToken, grantFocus);

                    if (grantFocus) {

                        // If granting focus to the embedded when tapped, we need to ensure the host