Commit caaa1d3d authored Oct 17, 2018 by Yohei Yukawa

Unextract InputMethodManagerService#startInputInnerLocked()

With my previous CL [1], IMMS#startInputInnerLocked() is called only
from IMMS#startInputUncheckedLocked().  By unextracting
IMMS#startInputInnerLocked() again, it would be much easier for us to
understand what IMMS#startInputUncheckedLocked() is actually doing.

To decouple actual behavior change from cosmetic code refactorings,
this CL does nothing except for merging IMMS#startInputInnerLocked()
into IMMS#startInputUncheckedLocked().

There should be no behavior change.  Non trivial behavior
simplifications will be done in subsequent CLs.

 [1]: I52f6c4cd1e02be3a59e9a87e33b0a44f4ba8d80b
      f91a2b10

Bug: 117730713
Test: atest ActivityManagerMultiDisplayTests
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Test: atest FrameworksCoreTests:android.view.inputmethod.InputMethodManagerTest
Change-Id: I71e259fa447dd06ff02b9ef8c958dc70bbce86ea

parent f91a2b10

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -1963,11 +1963,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		}
		}

		return startInputInnerLocked();
		}

		@GuardedBy("mMethodMap")
		InputBindResult startInputInnerLocked() {
		if (mCurMethodId == null) {
		return InputBindResult.NO_IME;
		}
		@@ -2005,7 +2000,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		// Wait, the client no longer has access to the display.
		return InputBindResult.INVALID_DISPLAY_ID;
		}
		final int displayId = mCurFocusedWindowClient.selfReportedDisplayId;
		mCurTokenDisplayId = (displayId != INVALID_DISPLAY) ? displayId : DEFAULT_DISPLAY;
		}