1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 6831eca32f72..df9a7c2cb586 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1700,8 +1700,12 @@ public class InputMethodService extends AbstractInputMethodService {
         if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) {
             return false;
         }
-        if (mInputEditorInfo != null
-                && (mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0) {
+        if ((mInputEditorInfo != null
+                && (mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0)
+                // If app window has portrait orientation, regardless of what display orientation
+                // is, IME shouldn't use fullscreen-mode.
+                || (mInputEditorInfo.internalImeOptions
+                        & EditorInfo.IME_FLAG_APP_WINDOW_PORTRAIT) != 0) {
             return false;
         }
         return true;