summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2019-01-30 01:15:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-01-30 01:15:36 +0000
commit4625b2e489d0d83a3376186f2b117813234dcb07 (patch)
tree0128b7de82fbb4a43d2ab36dc5014bc1d4996545
parent19939bdbe0532368286a6f5227e5f007164e062f (diff)
parent7f11eb9057447cfa36c951355a99f87eeb0cf1b0 (diff)
Merge "Add runtime_native namespace for properties"
-rw-r--r--api/system-current.txt4
-rw-r--r--core/java/android/provider/DeviceConfig.java10
-rw-r--r--services/core/java/com/android/server/am/SettingsToPropertiesMapper.java1
3 files changed, 15 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index c47a41a5ef56..00676c815f35 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5849,6 +5849,10 @@ package android.provider {
field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "enable_permissions_hub";
}
+ public static interface DeviceConfig.RuntimeNative {
+ field public static final String NAMESPACE = "runtime_native";
+ }
+
public static interface DeviceConfig.Storage {
field public static final String ISOLATED_STORAGE_ENABLED = "isolated_storage_enabled";
field public static final String NAMESPACE = "storage";
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 264f97568b50..0b23fe3e9168 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -150,6 +150,16 @@ public final class DeviceConfig {
}
/**
+ * Namespace for all runtime native related features.
+ *
+ * @hide
+ */
+ @SystemApi
+ public interface RuntimeNative {
+ String NAMESPACE = "runtime_native";
+ }
+
+ /**
* Namespace for attention-based features provided by on-device machine intelligence.
*
* @hide
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 128d98bcc738..5c6090030f74 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -79,6 +79,7 @@ class SettingsToPropertiesMapper {
static final String[] sDeviceConfigScopes = new String[] {
DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
DeviceConfig.NAMESPACE_NETD_NATIVE,
+ DeviceConfig.RuntimeNative.NAMESPACE,
};
private final String[] mGlobalSettings;