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

Commit f29e2228 authored by Alex Salo's avatar Alex Salo Committed by Android (Google) Code Review
Browse files

Merge "Remove PROPERTY_ prefix"

parents a6fd7351 c7b9c08f

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5833,9 +5833,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 {









@@ -5849,9 +5849,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 {

































core/java/android/provider/DeviceConfig.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -181,10 +181,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";















    }































    /**










@@ -284,10 +284,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";















    }































    /**

































services/core/java/com/android/server/attention/AttentionManagerService.java



+4
−4




























Original line number
Diff line number
Diff line








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