Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cfc5bb1 authored by Tony Mak's avatar Tony Mak
Browse files

Fix an issue that it is impossible to have multiple active sessions 

Root cause:
TCM caches SystemTC. TCM.createTCSession returns a wrapper of
the same SystemTC and it just updates the sessionID
(and some other session related stuff) of the shared system TC.
That means, if clients call createTCSession multiple times for multiple
active sessions, all of these session TCs have the same session ID
(the latest one) because they all point to the same SystemTC.

It has been an issue since P. But we don't really have code that creates
multiple active sessions before R. In R, we create a session per each
notification, and thus hit the bug.

Solution:
Don't cache SystemTC. SystemTC is just a thin wrapper that forwards calls
to TCMS anyway.

BUG: 149012454
Test: atest CtsTextClassifierService (Added a new test in ag/10260978.)
Test: Sanity tests: smart selection and smart replies are still working.

Change-Id: I71fe558b2f3d2c5d9eb0b6fc7f258fb4d8ad48d6
parent 4624cdd1

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();

        }

    }