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

Commit 2b7522a2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 47fb75da am: 84cbfc4b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056441



Change-Id: I0f129eb26c9e44f291df765fdd4bfeb88cedda9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f088608 84cbfc4b

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,