Merge "Move trace points to IMMS#onSessionCreated()" (e38c2d28) · Commits · e / os / android_frameworks_base

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

+30 −26

Original line number	Diff line number	Diff line
		@@ -1478,14 +1478,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		@Override
		public void sessionCreated(IInputMethodSession session) {
		Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.sessionCreated");
		final long ident = Binder.clearCallingIdentity();
		try {
		mParentIMMS.onSessionCreated(mMethod, session, mChannel);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		}
		}

		@@ -2539,11 +2537,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		mCaller.obtainMessageI(MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE, uid).sendToTarget();
		}

		void onSessionCreated(IInputMethod method, IInputMethodSession session,
		InputChannel channel) {
		@BinderThread
		void onSessionCreated(IInputMethod method, IInputMethodSession session, InputChannel channel) {
		Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.onSessionCreated");
		try {
		synchronized (ImfLock.class) {
		if (mUserSwitchHandlerTask != null) {
		// We have a pending user-switching task so it's better to just ignore this session.
		// We have a pending user-switching task so it's better to just ignore this
		// session.
		channel.dispose();
		return;
		}
		@@ -2567,6 +2568,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

		// Session abandoned. Close its associated input channel.
		channel.dispose();
		} finally {
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		}
		}

		@GuardedBy("ImfLock.class")