Merge "Add statsd flags to public namespaces" into sc-dev (f6561f6c) · Commits · e / os / android_frameworks_base

core/java/android/provider/DeviceConfig.java

+34 −33

Original line number	Diff line number	Diff line
		@@ -357,6 +357,38 @@ public final class DeviceConfig {
		*/
		public static final String NAMESPACE_SETTINGS_STATS = "settings_stats";

		/**
		* 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
		*/
		@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 storage-related features.
		*
		@@ -456,7 +488,8 @@ public final class DeviceConfig {
		*/
		@NonNull
		private static final List<String> PUBLIC_NAMESPACES =
		Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME);
		Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA,
		NAMESPACE_STATSD_JAVA_BOOT);
		/**
		* Privacy related properties definitions.
		*
		@@ -504,38 +537,6 @@ public final class DeviceConfig {
		public static final String NAMESPACE_CONNECTIVITY_THERMAL_POWER_MANAGER =
		"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
		*/
		@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.
		*