Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84d017c5 authored by Tej Singh's avatar Tej Singh Committed by Automerger Merge Worker
Browse files

Merge "Add statsd flags to public namespaces" into sc-dev am: f6561f6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13897151

Change-Id: I17e2909db70eab484c1ab65a03622fd91b96caa4
parents 4b48fc4b f6561f6c

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.

     *