diff options
| -rw-r--r-- | api/system-current.txt | 8 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/attention/AttentionManagerService.java | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 332ac2c70e0e..f5b33a6d0190 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5812,9 +5812,9 @@ package android.provider { } public static interface DeviceConfig.AttentionManagerService { + field public static final String COMPONENT_NAME = "component_name"; field public static final String NAMESPACE = "attention_manager_service"; - field public static final String PROPERTY_COMPONENT_NAME = "component_name"; - field public static final String PROPERTY_SERVICE_ENABLED = "service_enabled"; + field public static final String SERVICE_ENABLED = "service_enabled"; } public static interface DeviceConfig.ContentCapture { @@ -5828,9 +5828,9 @@ package android.provider { } public static interface DeviceConfig.IntelligenceAttention { + field public static final String ATTENTION_ENABLED = "attention_enabled"; + field public static final String ATTENTION_SETTINGS = "attention_settings"; field public static final String NAMESPACE = "intelligence_attention"; - field public static final String PROPERTY_ATTENTION_ENABLED = "attention_enabled"; - field public static final String PROPERTY_ATTENTION_SETTINGS = "attention_settings"; } public static interface DeviceConfig.NotificationAssistant { diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 264f97568b50..261f02e3e18c 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -159,10 +159,10 @@ public final class DeviceConfig { String NAMESPACE = "intelligence_attention"; /** If {@code true}, enables the attention features. */ - String PROPERTY_ATTENTION_ENABLED = "attention_enabled"; + String ATTENTION_ENABLED = "attention_enabled"; /** Settings for the attention features. */ - String PROPERTY_ATTENTION_SETTINGS = "attention_settings"; + String ATTENTION_SETTINGS = "attention_settings"; } /** @@ -258,10 +258,10 @@ public final class DeviceConfig { String NAMESPACE = "attention_manager_service"; /** If {@code true}, enables {@link AttentionManagerService} features. */ - String PROPERTY_SERVICE_ENABLED = "service_enabled"; + String SERVICE_ENABLED = "service_enabled"; /** Allows a CTS to inject a fake implementation. */ - String PROPERTY_COMPONENT_NAME = "component_name"; + String COMPONENT_NAME = "component_name"; } /** diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index 5b469fe2dc7a..2061b2681268 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -16,9 +16,9 @@ package com.android.server.attention; +import static android.provider.DeviceConfig.AttentionManagerService.COMPONENT_NAME; import static android.provider.DeviceConfig.AttentionManagerService.NAMESPACE; -import static android.provider.DeviceConfig.AttentionManagerService.PROPERTY_COMPONENT_NAME; -import static android.provider.DeviceConfig.AttentionManagerService.PROPERTY_SERVICE_ENABLED; +import static android.provider.DeviceConfig.AttentionManagerService.SERVICE_ENABLED; import android.Manifest; import android.annotation.Nullable; @@ -129,7 +129,7 @@ public class AttentionManagerService extends SystemService { } private boolean isServiceEnabled() { - final String enabled = DeviceConfig.getProperty(NAMESPACE, PROPERTY_SERVICE_ENABLED); + final String enabled = DeviceConfig.getProperty(NAMESPACE, SERVICE_ENABLED); return enabled == null ? DEFAULT_SERVICE_ENABLED : "true".equals(enabled); } @@ -279,7 +279,7 @@ public class AttentionManagerService extends SystemService { * system. */ private static ComponentName resolveAttentionService(Context context) { - final String flag = DeviceConfig.getProperty(NAMESPACE, PROPERTY_COMPONENT_NAME); + final String flag = DeviceConfig.getProperty(NAMESPACE, COMPONENT_NAME); final String componentNameString = flag != null ? flag : context.getString( R.string.config_defaultAttentionService); |