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
This commit is contained in:
Jan Althaus
2018-01-26 17:53:31 +01:00
parent 650fa8579e
commit 67d234d726
2 changed files with 3 additions and 3 deletions

View File

@@ -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,

View File

@@ -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");
}