From 3c093ddbf2c8c89970a07ed8d6d39a5446fb7b73 Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Tue, 17 Nov 2020 18:49:04 -0800 Subject: [PATCH] Add statsd flag namespaces Add statsd_native and statsd_native boot namespaces, and sync them to DeviceConfig. Test: manually checked that statsd could receive flags with selinux changes in Bug: 172842175 Change-Id: I9b61e78e9131cf9733d46e73d9ea92e72d1ce1b7 --- core/api/system-current.txt | 2 ++ core/java/android/provider/DeviceConfig.java | 16 ++++++++++++++++ .../server/am/SettingsToPropertiesMapper.java | 2 ++ 3 files changed, 20 insertions(+) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 05dbf0000b745..34efa1ef61b08 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -8406,6 +8406,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_NATIVE = "statsd_native"; + field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot"; field @Deprecated public static final String NAMESPACE_STORAGE = "storage"; field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot"; field public static final String NAMESPACE_SYSTEMUI = "systemui"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 97c9f4bbb4ba7..c668f3684f94b 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -450,6 +450,22 @@ public final class DeviceConfig { public static final String NAMESPACE_CONNECTIVITY_THERMAL_POWER_MANAGER = "connectivity_thermal_power_manager"; + /** + * Namespace for all statsd native features that can be applied immediately. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_STATSD_NATIVE = "statsd_native"; + + /** + * Namespace for all statsd native features that are applied on boot. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot"; + /** * Namespace for configuration related features. * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 28afcbbb2a868..7299e814b0208 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -88,6 +88,8 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, + DeviceConfig.NAMESPACE_STATSD_NATIVE, + DeviceConfig.NAMESPACE_STATSD_NATIVE_BOOT, DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, };