From 001b3418e3f137ab6acd4f1bbe3228c3270deda9 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 17 Feb 2020 17:52:06 +0100
Subject: [PATCH] Allow showing when control target is IME fallback

When we need to make the IME fallback the control target, we also
need to allow showing the IME as the existing check doesn't pass.

Bug: 111084606
Test: MultiDisplaySystemDecorationTests.testCrossDisplayBasicImeOperations
Test: MultiDisplaySecurityTests.testNoInputConnectionForUntrustedVirtualDisplay
Change-Id: Ibbf21a8da2e523fce1703b80b1cba45c0989eecf
---
 services/core/java/com/android/server/wm/DisplayContent.java  | 4 ++++
 .../java/com/android/server/wm/ImeInsetsSourceProvider.java   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 8a46771aba8fa..af2a91d04b0f6 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3430,6 +3430,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
         if (target != null && target.getDisplayContent().canShowIme()) {
             return target;
         }
+        return getImeFallback();
+    }
+
+    WindowState getImeFallback() {
 
         // host is in non-default display that doesn't support system decor, default to
         // default display's StatusBar to control IME.
diff --git a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
index 370d125787285..725596819b79a 100644
--- a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
+++ b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
@@ -118,6 +118,7 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
 
         return (!dcTarget.isClosing() && mImeTargetFromIme == dcTarget)
                 || (mImeTargetFromIme != null && dcTarget.getParentWindow() == mImeTargetFromIme
-                && dcTarget.mSubLayer > mImeTargetFromIme.mSubLayer);
+                        && dcTarget.mSubLayer > mImeTargetFromIme.mSubLayer)
+                || mImeTargetFromIme == mDisplayContent.getImeFallback();
     }
 }