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

Commit 47fb75da authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add experiment flag namespace for Multi-Gen LRU" am: d7145d4c... 

Merge "Merge "Add experiment flag namespace for Multi-Gen LRU" am: d7145d4c am: f72a1a59" into tm-dev-plus-aosp
parents 8264c860 dd827b3b

core/java/android/provider/DeviceConfig.java

+7 −0
Original line number Diff line number Diff line
@@ -312,6 +312,13 @@ public final class DeviceConfig { 
    @SystemApi

    public static final String NAMESPACE_MEDIA_NATIVE = "media_native";



    /**

     * Namespace for all Kernel Multi-Gen LRU feature.

     *

     * @hide

     */

    public static final String NAMESPACE_MGLRU_NATIVE = "mglru_native";



    /**

     * Namespace for all netd related features.

     *

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

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,

        DeviceConfig.NAMESPACE_LMKD_NATIVE,

        DeviceConfig.NAMESPACE_MEDIA_NATIVE,

        DeviceConfig.NAMESPACE_MGLRU_NATIVE,

        DeviceConfig.NAMESPACE_NETD_NATIVE,

        DeviceConfig.NAMESPACE_NNAPI_NATIVE,

        DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,