From 3ecea5572548cd1ea24ff2a561b2e7ef14e83f2d Mon Sep 17 00:00:00 2001 From: Anna Wasewicz Date: Fri, 19 Apr 2019 15:27:09 -0700 Subject: [PATCH] Add DeviceConfig flag for ContentSuggestionsService. Test: presubmit Bug: 123289833 Change-Id: I016a7585bc03e25bd494b9e3bd3080416d67ee50 --- core/java/android/provider/DeviceConfig.java | 8 ++++++++ .../com/android/server/am/SettingsToPropertiesMapper.java | 1 + 2 files changed, 9 insertions(+) diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 6c498c736854d..18b49dae700fd 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -158,6 +158,14 @@ public final class DeviceConfig { @SystemApi public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; + /** + * Definitions for properties related to Content Suggestions. + * + * @hide + */ + public static final String NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS = + "intelligence_content_suggestions"; + /** * Namespace for all media native related features. * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 99380c94b869c..83e9948d051df 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -81,6 +81,7 @@ public class SettingsToPropertiesMapper { static final String[] sDeviceConfigScopes = new String[] { DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT, DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT, + DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS, DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE,