Merge "Fix Keyboard stays on while startSeamlessRotation" into rvc-dev am: 641c8844ba am: 49a272a506

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

Change-Id: I8d58afe762b27f730743d8f60ed3a0d0d62bb5a5

1 files changed, 7 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index b65020d7eaa6..837fafec1634 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -26,6 +26,7 @@ import static android.app.WindowConfiguration.isSplitScreenWindowingMode;
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.os.PowerManager.DRAW_WAKE_LOCK;
 import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
+import static android.view.InsetsState.ITYPE_IME;
 import static android.view.SurfaceControl.Transaction;
 import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
 import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
@@ -757,6 +758,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
             oldRotation = mPendingSeamlessRotate.getOldRotation();
         }
 
+        // Skip performing seamless rotation when the controlled insets is IME with visible state.
+        if (mControllableInsetProvider != null
+                && mControllableInsetProvider.getSource().getType() == ITYPE_IME) {
+            return;
+        }
+
         if (mForceSeamlesslyRotate || requested) {
             if (mControllableInsetProvider != null) {
                 mControllableInsetProvider.startSeamlessRotation();