commit 1fdacf6376ac3cd1be0d6d58aff4068ef571f2f0
author Suren Baghdasaryan <surenb@google.com> Wed Aug 11 22:56:11 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 11 22:56:11 2021 +0000
tree dbe13dae18f6fcfe7295751c572cb60381078532
parent b801a513d173ff89ebfcece46db7f1d9db0c7422
parent 9a740a18dfca7fbd4b20b063c4bda1500c16a73c

Merge "Adding native flag namespace for lmkd."

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 2d446fc..aa528ba 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -7768,6 +7768,7 @@
     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_MEDIA_NATIVE = "media_native";
     field public static final String NAMESPACE_NETD_NATIVE = "netd_native";
     field public static final String NAMESPACE_OTA = "ota";

core/java/android/provider/DeviceConfig.java

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index bd84c84..c89f4f5 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -201,6 +201,14 @@
             "intelligence_content_suggestions";
 
     /**
+     * Namespace for all lmkd related features.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";
+
+    /**
      * Namespace for all media native related features.
      *
      * @hide

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

diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index c20a01d..00dfd38 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -84,6 +84,7 @@
         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,