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

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

Merge "Java flag support for statsd" into sc-dev am: 0c7463b8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I102001d2d327b141f697db73bad7bf3dc54c5772
parents 5bf28b0e 0c7463b8

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/DeviceConfig.java

+16 −0
Original line number Diff line number Diff line
@@ -513,6 +513,22 @@ 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.

     *