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

Commit 8afcf441 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am 211eae98: am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev 

* commit '211eae98':
  Add the trace tag for Dalvik.
parents 5e6fbf26 211eae98

core/java/android/os/Trace.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ public final class Trace { 
    public static final long TRACE_TAG_APP = 1L << 12;

    public static final long TRACE_TAG_APP = 1L << 12;

    /** @hide */

    /** @hide */

    public static final long TRACE_TAG_RESOURCES = 1L << 13;

    public static final long TRACE_TAG_RESOURCES = 1L << 13;

    /** @hide */

    public static final long TRACE_TAG_DALVIK = 1L << 14;





    private static final long TRACE_TAG_NOT_READY = 1L << 63;

    private static final long TRACE_TAG_NOT_READY = 1L << 63;

    private static final int MAX_SECTION_NAME_LEN = 127;

    private static final int MAX_SECTION_NAME_LEN = 127;