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

Commit 37f6a154 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

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

parents cd791d5a ec7100fe

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