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

Commit 67d234d7 authored by Jan Althaus's avatar Jan Althaus
Browse files

Updating the text classifier model path 

The lib2 implementation of libtextclassifier is incompatible with models
for lib1. To avoid trying to load a lib1 model and failing (which happens
when devices are upgraded from O to P), we need a new update model path.
Using this opportunity to remove smartselection from the filename, which
isn't appropriate any more given what the model is used for.

Test: Ran core framework tests
Change-Id: I79a80d10d920019f5091fe9884f370149d39fe88
parent 650fa857

core/java/android/view/textclassifier/TextClassifierImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ final class TextClassifierImpl implements TextClassifier { 
    private static final String MODEL_DIR = "/etc/textclassifier/";

    private static final String MODEL_FILE_REGEX = "textclassifier\\.smartselection\\.(.*)\\.model";

    private static final String UPDATED_MODEL_FILE_PATH =

            "/data/misc/textclassifier/textclassifier.smartselection.model";

            "/data/misc/textclassifier/textclassifier.model";

    private static final List<String> ENTITY_TYPES_ALL =

            Collections.unmodifiableList(Arrays.asList(

                    TextClassifier.TYPE_ADDRESS,

services/core/java/com/android/server/updates/SmartSelectionInstallReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ public class SmartSelectionInstallReceiver extends ConfigUpdateInstallReceiver { 
    public SmartSelectionInstallReceiver() {

        super(

            "/data/misc/textclassifier/",

            "textclassifier.smartselection.model",

            "metadata/smartselection",

            "textclassifier.model",

            "metadata/classification",

            "version");

    }