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

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

Change-Id: I1ae453af76576d740941c437559206e8fca4924b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chavi Weingarten
2023-04-05 18:03:51 +00:00
committed by Automerger Merge Worker

View File

@@ -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