summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuren Baghdasaryan <surenb@google.com>2021-08-04 12:07:59 -0700
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-12-24 23:06:04 +0000
commita415243d5295a02edb5e59d42341aedae3b6bae2 (patch)
tree2f6fec17812ac1b6a493f5a4e4258c29d8a55493
parentae8826ef3c0b982d3d154d57c881ab449559b850 (diff)
downloadbase-a415243d5295a02edb5e59d42341aedae3b6bae2.tar.gz
Adding native flag namespace for lmkd.
For experiment flag testing, adding lmkd flag in DeviceConfig. Bug: 194316048 Signed-off-by: Suren Baghdasaryan <surenb@google.com> Change-Id: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 Merged-In: I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 (cherry picked from commit f670cc64ca647032e9078b68baa83eea33d38bc7) Merged-In:I1f13d6bbb4a9a7fd8825d7e5acde416750271df4
-rw-r--r--core/java/android/provider/DeviceConfig.java7
-rw-r--r--services/core/java/com/android/server/am/SettingsToPropertiesMapper.java1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 431bf4c54b4b..217e17ddd7b4 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -258,6 +258,13 @@ public final class DeviceConfig {
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.
*
* @hide
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index e022e977e02f..2f20efbf5730 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 @@ 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,