Merge "Do not pass null to IInputMethod#setSessionEnabled" (b503d782) · Commits · e / os / android_frameworks_base

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -2369,23 +2369,23 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		void setEnabledSessionInMainThread(SessionState session) {
		if (mEnabledSession != session) {
		if (mEnabledSession != null) {
		if (mEnabledSession != null && mEnabledSession.session != null) {
		try {
		if (DEBUG) Slog.v(TAG, "Disabling: " + mEnabledSession);
		mEnabledSession.method.setSessionEnabled(
		mEnabledSession.session, false);
		mEnabledSession.method.setSessionEnabled(mEnabledSession.session, false);
		} catch (RemoteException e) {
		}
		}
		mEnabledSession = session;
		if (mEnabledSession != null && mEnabledSession.session != null) {
		try {
		if (DEBUG) Slog.v(TAG, "Enabling: " + mEnabledSession);
		session.method.setSessionEnabled(
		session.session, true);
		mEnabledSession.method.setSessionEnabled(mEnabledSession.session, true);
		} catch (RemoteException e) {
		}
		}
		}
		}

		@Override
		public boolean handleMessage(Message msg) {