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

Commit ef43faed authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Adding native flag namespace for lmkd." into sc-dev-plus-aosp am: 6e6a94d0 

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

Change-Id: Ib760c66e5683e0025b903d538808c6778859e97c
parents eee1763b 6e6a94d0

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9102,6 +9102,7 @@ package android.provider { 
    field public static final String NAMESPACE_GAME_DRIVER = "game_driver";

    field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";

    field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention";

    field public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";

    field public static final String NAMESPACE_LOCATION = "location";

    field public static final String NAMESPACE_MEDIA = "media";

    field public static final String NAMESPACE_MEDIA_NATIVE = "media_native";

core/java/android/provider/DeviceConfig.java

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

    public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";



    /**

     * Namespace for all lmkd related features.

     *

     * @hide

     */

    @SystemApi

    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,