summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMatt Pape <mpape@google.com>2019-04-19 12:31:24 -0700
committerMatt Pape <mpape@google.com>2019-04-30 16:35:16 +0000
commit15769e2ffab7f79b98df75e2d803c588a4fffc09 (patch)
tree640c0481755dd50addd48c6d3e5439502310cdd7 /core/java/android
parent28cb4d23db83de7b957e0b2fc6a3dae0371b4799 (diff)
Migrate usage of single property lister to multi prop listener.
Test: atest CtsViewTestCases:TextClassificationManagerTest atest FrameworksCoreTests:TextClassificationManagerTest atest ExtServicesUnitTests:AssistantSettingsTest atest SystemUITests:SmartReplyConstantsTest atest FrameworksServicesTests:AutofillManagerServiceTest atest FrameworksUiServicesTests:NotificationManagerServiceTest Bug: 128902955 Change-Id: I00e524b615b3bd03b6b40535410ff7eb2ef6f8ee
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/textclassifier/TextClassificationManager.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java
index 417c6e7f3c75..042b943c60a3 100644
--- a/core/java/android/view/textclassifier/TextClassificationManager.java
+++ b/core/java/android/view/textclassifier/TextClassificationManager.java
@@ -25,6 +25,7 @@ import android.content.Context;
import android.database.ContentObserver;
import android.os.ServiceManager;
import android.provider.DeviceConfig;
+import android.provider.DeviceConfig.Properties;
import android.provider.Settings;
import android.service.textclassifier.TextClassifierService;
import android.view.textclassifier.TextClassifier.TextClassifierType;
@@ -199,7 +200,7 @@ public final class TextClassificationManager {
getApplicationContext().getContentResolver()
.unregisterContentObserver(mSettingsObserver);
if (ConfigParser.ENABLE_DEVICE_CONFIG) {
- DeviceConfig.removeOnPropertyChangedListener(mSettingsObserver);
+ DeviceConfig.removeOnPropertiesChangedListener(mSettingsObserver);
}
}
} finally {
@@ -286,7 +287,7 @@ public final class TextClassificationManager {
}
private static final class SettingsObserver extends ContentObserver
- implements DeviceConfig.OnPropertyChangedListener {
+ implements DeviceConfig.OnPropertiesChangedListener {
private final WeakReference<TextClassificationManager> mTcm;
@@ -298,7 +299,7 @@ public final class TextClassificationManager {
false /* notifyForDescendants */,
this);
if (ConfigParser.ENABLE_DEVICE_CONFIG) {
- DeviceConfig.addOnPropertyChangedListener(
+ DeviceConfig.addOnPropertiesChangedListener(
DeviceConfig.NAMESPACE_TEXTCLASSIFIER,
ActivityThread.currentApplication().getMainExecutor(),
this);
@@ -311,7 +312,7 @@ public final class TextClassificationManager {
}
@Override
- public void onPropertyChanged(String namespace, String name, String value) {
+ public void onPropertiesChanged(Properties properties) {
invalidateSettings();
}