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

Commit 52e69a4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding native flag namespace for lmkd." into sc-dev am: 291f266c 

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

Change-Id: I0b60b3de57c7a5dd1fa185dce832f244df828cf8
parents 64bb3f3c 291f266c

core/java/android/provider/DeviceConfig.java

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

    @TestApi

    public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";

    public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";





    /**

     * Namespace for all lmkd related features.

     *

     * @hide

     */

    public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";



    /**

    /**

     * Namespace for all location related features.

     * Namespace for all location related features.

     *

     *

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

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

        DeviceConfig.NAMESPACE_CONNECTIVITY,

        DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,

        DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,

        DeviceConfig.NAMESPACE_LMKD_NATIVE,

        DeviceConfig.NAMESPACE_MEDIA_NATIVE,

        DeviceConfig.NAMESPACE_MEDIA_NATIVE,

        DeviceConfig.NAMESPACE_NETD_NATIVE,

        DeviceConfig.NAMESPACE_NETD_NATIVE,

        DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,