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

Commit 4072075f authored by Anna Wasewicz's avatar Anna Wasewicz Committed by android-build-merger
Browse files

Merge "Add DeviceConfig flag for ContentSuggestionsService. Test: presubmit... 

Merge "Add DeviceConfig flag for ContentSuggestionsService. Test: presubmit Bug: 123289833" into qt-dev
am: 3eb46249

Change-Id: Ic35f82ad4f95251eb0f749921431ac468b063667
parents a7907d78 3eb46249

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -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.

     *

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -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,