1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index 758062f41428..9296618daac5 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -713,6 +713,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
                 // applied before starting animation).
                 continue;
             }
+            if (fromIme && animationType == ANIMATION_TYPE_USER) {
+                // App is already controlling the IME, don't cancel it.
+                continue;
+            }
             typesReady |= InsetsState.toPublicType(consumer.getType());
         }
         applyAnimation(typesReady, true /* show */, fromIme);