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

Commit 76da258a authored by Tim Joines's avatar Tim Joines Committed by Automerger Merge Worker
Browse files

Merge "Adding native flag namespace for lmkd." into sc-qpr1-dev am: aeb139ac 

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

Change-Id: Ib632461ecfc34beebe8d37e7d5962e5fc52b749a
parents bf5ad906 aeb139ac

core/java/android/provider/DeviceConfig.java

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

    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.

     *

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

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

        DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,

        DeviceConfig.NAMESPACE_LMKD_NATIVE,

        DeviceConfig.NAMESPACE_MEDIA_NATIVE,

        DeviceConfig.NAMESPACE_NETD_NATIVE,

        DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,