From ac8bdd203c18d0f99b825132cf6134dce5d12bc6 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Fri, 11 Sep 2015 18:17:11 -0700
Subject: Mechanical merge of nested if statements.

This is just a mechanical merge of nested if statements with a dead code
removal.  Nothing is changed logically.

Bug: 22285167
Change-Id: I28c1de84635b68108b25ec32ec58de2128758512
---
 core/java/android/inputmethodservice/InputMethodService.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 112ae1076aa3..5d667e1fa3f2 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1456,15 +1456,9 @@ public class InputMethodService extends AbstractInputMethodService {
         final int previousImeWindowStatus =
                 (mWindowVisible ? IME_ACTIVE : 0) | (isInputViewShown() ? IME_VISIBLE : 0);
         mWindowVisible = true;
-        if (!mShowInputRequested) {
-            if (mInputStarted) {
-                if (showInput) {
-                    doShowInput = true;
-                    mShowInputRequested = true;
-                }
-            }
-        } else {
-            showInput = true;
+        if (!mShowInputRequested && mInputStarted && showInput) {
+            doShowInput = true;
+            mShowInputRequested = true;
         }
 
         if (DEBUG) Log.v(TAG, "showWindow: updating UI");
-- 
cgit v1.2.3-59-g8ed1b