commit d04af4e0f2f187d22c9ec1845347f4cbbab8c9d9
author Suren Baghdasaryan <surenb@google.com> Wed Aug 11 18:13:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 18:13:25 2021 +0000
tree a8efeb97331498fd67cded3ebb24b5114a8f11c0
parent 8bc1803c4fa79a4830b75401ec8eddc8e7c4c3bf
parent ef43faede13e24fd166e86e22a473a6174e10d70

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

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

Change-Id: Ie64240f2226b1bc6a6a5418da731cdf7d4f65dae

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index c45d2b3..a8dcb7e 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9102,6 +9102,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_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

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index e7e53b3..56303c1 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -258,6 +258,14 @@
     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.
      *
      * @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 e022e97..2f20efb 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,