Merge "Fix an issue that it is impossible to have multiple active sessions" (c5bd4270) · Commits · e / os / android_frameworks_base

core/java/android/view/textclassifier/TextClassificationManager.java

+6 −16

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.content.Context;
		import android.os.ServiceManager;
		import android.provider.DeviceConfig;
		import android.provider.DeviceConfig.Properties;
		import android.util.SparseArray;
		import android.view.textclassifier.TextClassifier.TextClassifierType;

		import com.android.internal.annotations.GuardedBy;
		@@ -62,8 +61,6 @@ public final class TextClassificationManager {
		@Nullable
		private TextClassifier mLocalTextClassifier;
		@GuardedBy("mLock")
		private SparseArray<TextClassifier> mSystemTextClassifiers = new SparseArray<>();
		@GuardedBy("mLock")
		private TextClassificationSessionFactory mSessionFactory;
		@GuardedBy("mLock")
		private TextClassificationConstants mSettings;
		@@ -207,23 +204,17 @@ public final class TextClassificationManager {
		/** @hide */
		private TextClassifier getSystemTextClassifier(@TextClassifierType int type) {
		synchronized (mLock) {
		if (mSystemTextClassifiers.get(type) == null
		&& getSettings().isSystemTextClassifierEnabled()) {
		if (getSettings().isSystemTextClassifierEnabled()) {
		try {
		mSystemTextClassifiers.put(
		type,
		new SystemTextClassifier(
		Log.d(LOG_TAG, "Initializing SystemTextClassifier, type = " + type);
		return new SystemTextClassifier(
		mContext,
		getSettings(),
		/* useDefault= */ type == TextClassifier.DEFAULT_SERVICE));
		Log.d(LOG_TAG, "Initialized SystemTextClassifier, type = " + type);
		/* useDefault= */ type == TextClassifier.DEFAULT_SERVICE);
		} catch (ServiceManager.ServiceNotFoundException e) {
		Log.e(LOG_TAG, "Could not initialize SystemTextClassifier", e);
		}
		}
		if (mSystemTextClassifiers.get(type) != null) {
		return mSystemTextClassifiers.get(type);
		}
		return TextClassifier.NO_OP;
		}
		}
		@@ -263,7 +254,6 @@ public final class TextClassificationManager {
		private void invalidateTextClassifiers() {
		synchronized (mLock) {
		mLocalTextClassifier = null;
		mSystemTextClassifiers.clear();
		}
		}