commit e80e94182cbde56dc0ff796edc2e248d85babeed
author Tiger Huang <tigerhuang@google.com> Wed Sep 02 00:02:17 2020 +0800
committer Tiger Huang <tigerhuang@google.com> Wed Sep 02 06:48:08 2020 +0000
tree b3fe8530acd40945156f1aa58a38a1dfd474eb93
parent 0ac2f4e4f7bd289274276f1222d9e81aa386e82f

Compare with oldSoftInputMode after restoring softInputMode

... of mWindowAttributes. Apps might update LayoutParams with
softInputMode unspecified on applying insets, and this can cause
infinite loop in the previous logic, because we would auto-compute
softInputMode for the unspecified one, which makes app's softInputMode
never be the same as the one in ViewRootImpl.mWindowAttributes.

Fix: 163009478
Test: Print stack trace before calling requestFitSystemWindows() and
      follow the steps in the bug.
Test: Open Messages, go to attachments, reopen IME
Change-Id: I2341121b69209688c2f6fb033f51611b21422a04

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index bcf3b49..5c42408 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1456,7 +1456,7 @@
                         | (oldSoftInputMode & WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST);
             }
 
-            if ((changes & LayoutParams.SOFT_INPUT_MODE_CHANGED) != 0) {
+            if (mWindowAttributes.softInputMode != oldSoftInputMode) {
                 requestFitSystemWindows();
             }