summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tej Singh <singhtejinder@google.com> 2021-03-04 03:11:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-04 03:11:12 +0000
commit0c7463b8d74fb35dc62f52a959647ad0db9b47ed (patch)
treef5f7c5dc63eddc2b30488cfa268c8ca8e24b1e86
parentb797729b3fb4e6cf8b9ea7ac3aa27a5cf3ecfa24 (diff)
parentd5dbfcb09a6d7eeccd5b91d53be4aa276ae47def (diff)
Merge "Java flag support for statsd" into sc-dev
-rw-r--r--core/api/system-current.txt2
-rw-r--r--core/java/android/provider/DeviceConfig.java16
2 files changed, 18 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 5d1185d85686..8f067c237bbe 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -8845,6 +8845,8 @@ package android.provider {
field public static final String NAMESPACE_RUNTIME_NATIVE = "runtime_native";
field public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot";
field public static final String NAMESPACE_SCHEDULER = "scheduler";
+ field public static final String NAMESPACE_STATSD_JAVA = "statsd_java";
+ field public static final String NAMESPACE_STATSD_JAVA_BOOT = "statsd_java_boot";
field public static final String NAMESPACE_STATSD_NATIVE = "statsd_native";
field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot";
field @Deprecated public static final String NAMESPACE_STORAGE = "storage";
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 6e89faf9c2ed..e9bbcc79e9df 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -505,6 +505,22 @@ public final class DeviceConfig {
"connectivity_thermal_power_manager";
/**
+ * Namespace for all statsd java features that can be applied immediately.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_STATSD_JAVA = "statsd_java";
+
+ /**
+ * Namespace for all statsd java features that are applied on boot.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_STATSD_JAVA_BOOT = "statsd_java_boot";
+
+ /**
* Namespace for all statsd native features that can be applied immediately.
*
* @hide