Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-v2-dev (cdda26f9) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1732,12 +1732,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_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0) {
		& EditorInfo.IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0)) {
		return false;
		}
		return true;