summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vikram Gaur <vikramgaur@google.com> 2022-10-05 00:47:30 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-10-05 00:47:30 +0000
commitc11d99f05d439e00d7b653908bbe38ecf9c1768d (patch)
tree6d465f1e09d70a58eb05f3f919559d9b60365838
parent4fe1ed8e5147826712793885d4c6a088605743b7 (diff)
parent9f11b323bea495d267d29651f2c2106c70ce88e3 (diff)
Merge "Add Remote Key Provisioning Daemon native namespace for feature flags."
-rw-r--r--core/java/android/provider/DeviceConfig.java8
-rw-r--r--services/core/java/com/android/server/am/SettingsToPropertiesMapper.java1
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 7b9ef726b1a3..466ac7895710 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -377,6 +377,14 @@ public final class DeviceConfig {
public static final String NAMESPACE_REBOOT_READINESS = "reboot_readiness";
/**
+ * Namespace for Remote Key Provisioning related features.
+ *
+ * @hide
+ */
+ public static final String NAMESPACE_REMOTE_KEY_PROVISIONING_NATIVE =
+ "remote_key_provisioning_native";
+
+ /**
* Namespace for Rollback flags that are applied immediately.
*
* @hide
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 5b80f40aa2c0..5ddb45ded19e 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -90,6 +90,7 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_NETD_NATIVE,
DeviceConfig.NAMESPACE_NNAPI_NATIVE,
DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,
+ DeviceConfig.NAMESPACE_REMOTE_KEY_PROVISIONING_NATIVE,
DeviceConfig.NAMESPACE_RUNTIME_NATIVE,
DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,
DeviceConfig.NAMESPACE_STATSD_NATIVE,