Merge "Eliminate the inconsistency between the states of AMS and TSMS" (153a1bdd) · Commits · e / os / android_frameworks_base

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

+22 −4

Original line number	Diff line number	Diff line
		@@ -865,6 +865,17 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
		}
		}

		public void onServiceDisconnected() {
		if (DBG) {
		Slog.d(TAG, "onServiceDisconnected");
		}

		synchronized(mSpellCheckerMap) {
		mSpellChecker = null;
		mConnected = false;
		}
		}

		public void removeListener(ISpellCheckerSessionListener listener) {
		if (DBG) {
		Slog.w(TAG, "remove listener: " + listener.hashCode());
		@@ -1019,10 +1030,17 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
		@Override
		public void onServiceDisconnected(ComponentName name) {
		synchronized(mSpellCheckerMap) {
		onServiceDisconnectedInnerLocked(name);
		}
		}

		private void onServiceDisconnectedInnerLocked(ComponentName name) {
		if (DBG) {
		Slog.w(TAG, "onServiceDisconnected: " + name);
		}
		final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);
		if (group != null && this == group.mInternalConnection) {
		mSpellCheckerBindGroups.remove(mSciId);
		}
		group.onServiceDisconnected();
		}
		}
		}