summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorMatt Lee <matthewhlee@google.com>2022-05-05 11:26:23 -0700
committerMatt Lee <matthewhlee@google.com>2022-05-05 12:22:40 -0700
commit15d9159eb00fb7fd92f9dc249af588f655fd8f66 (patch)
treec1efb1df7f5db3060639f318ee5e3b141742e91b /services
parent4ec9564fc91b8fcf083537096907249d58dafd8f (diff)
parent898ad0236f79d81514806e4f4ca3a2fe401e0705 (diff)
Merge s-mpr-2022-05
Change-Id: I26c8656231e5a535c3b3555f99b588fe03c9ef55
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 42c6dd43ebce..19df6345c22a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4122,6 +4122,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
* which controls the visibility and animation of the input method window.
*/
void updateImeInputAndControlTarget(WindowState target) {
+ if (target != null && target.mActivityRecord != null) {
+ target.mActivityRecord.mImeInsetsFrozenUntilStartInput = false;
+ }
if (mImeInputTarget != target) {
ProtoLog.i(WM_DEBUG_IME, "setInputMethodInputTarget %s", target);
setImeInputTarget(target);