Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix performance regression in textclassifier"

Browse Source
This commit is contained in:
John Reck
2019-04-02 16:38:48 +00:00
committed by Android (Google) Code Review
parent 43aae704a4 bcc0b914e3
commit 44eaac327b
3 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/android/view/textclassifier/ConfigParser.java
View File

@@ -33,6 +33,10 @@ public final class ConfigParser {
private final KeyValueListParser mParser;
// TODO: Re-enable DeviceConfig when it has reasonable performance or just delete the
// option of using DeviceConfig entirely.
static final boolean ENABLE_DEVICE_CONFIG = false;
public ConfigParser(@Nullable String textClassifierConstants) {
final KeyValueListParser parser = new KeyValueListParser(',');
try {
@@ -48,39 +52,55 @@ public final class ConfigParser {
* Reads a boolean flag.
*/
public boolean getBoolean(String key, boolean defaultValue) {
return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getBoolean(key, defaultValue));
if (ENABLE_DEVICE_CONFIG) {
return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getBoolean(key, defaultValue));
} else {
return mParser.getBoolean(key, defaultValue);
}
}
/**
* Reads an integer flag.
*/
public int getInt(String key, int defaultValue) {
return DeviceConfig.getInt(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getInt(key, defaultValue));
if (ENABLE_DEVICE_CONFIG) {
return DeviceConfig.getInt(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getInt(key, defaultValue));
} else {
return mParser.getInt(key, defaultValue);
}
}
/**
* Reads a float flag.
*/
public float getFloat(String key, float defaultValue) {
return DeviceConfig.getFloat(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getFloat(key, defaultValue));
if (ENABLE_DEVICE_CONFIG) {
return DeviceConfig.getFloat(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getFloat(key, defaultValue));
} else {
return mParser.getFloat(key, defaultValue);
}
}
/**
* Reads a string flag.
*/
public String getString(String key, String defaultValue) {
return DeviceConfig.getString(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getString(key, defaultValue));
if (ENABLE_DEVICE_CONFIG) {
return DeviceConfig.getString(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
key,
mParser.getString(key, defaultValue));
} else {
return mParser.getString(key, defaultValue);
}
}
}

14
core/java/android/view/textclassifier/TextClassificationManager.java
View File

@@ -197,7 +197,9 @@ public final class TextClassificationManager {
if (mSettingsObserver != null) {
getApplicationContext().getContentResolver()
.unregisterContentObserver(mSettingsObserver);
DeviceConfig.removeOnPropertyChangedListener(mSettingsObserver);
if (ConfigParser.ENABLE_DEVICE_CONFIG) {
DeviceConfig.removeOnPropertyChangedListener(mSettingsObserver);
}
}
} finally {
super.finalize();
@@ -292,10 +294,12 @@ public final class TextClassificationManager {
Settings.Global.getUriFor(Settings.Global.TEXT_CLASSIFIER_CONSTANTS),
false /* notifyForDescendants */,
this);
DeviceConfig.addOnPropertyChangedListener(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
ActivityThread.currentApplication().getMainExecutor(),
this);
if (ConfigParser.ENABLE_DEVICE_CONFIG) {
DeviceConfig.addOnPropertyChangedListener(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
ActivityThread.currentApplication().getMainExecutor(),
this);
}
}
@Override

5
core/tests/coretests/src/android/view/textclassifier/ConfigParserTest.java
View File

@@ -26,6 +26,7 @@ import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,6 +59,7 @@ public class ConfigParserTest {
}
@Test
@Ignore // TODO: Re-enable once ConfigParser#ENABLE_DEVICE_CONFIG is finalized
public void getBoolean_deviceConfig() {
DeviceConfig.setProperty(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
@@ -77,6 +79,7 @@ public class ConfigParserTest {
}
@Test
@Ignore // TODO: Re-enable once ConfigParser#ENABLE_DEVICE_CONFIG is finalized
public void getInt_deviceConfig() {
DeviceConfig.setProperty(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
@@ -94,6 +97,7 @@ public class ConfigParserTest {
}
@Test
@Ignore // TODO: Re-enable once ConfigParser#ENABLE_DEVICE_CONFIG is finalized
public void getFloat_deviceConfig() {
DeviceConfig.setProperty(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
@@ -111,6 +115,7 @@ public class ConfigParserTest {
}
@Test
@Ignore // TODO: Re-enable once ConfigParser#ENABLE_DEVICE_CONFIG is finalized
public void getString_deviceConfig() {
DeviceConfig.setProperty(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,