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

Commit c3002d2e authored by Mika Raento's avatar Mika Raento Committed by android-build-merger
Browse files

Merge "Systrace support for NNAPI" am: ecb0302a am: ae359622 

am: 904e3349

Change-Id: I2a543b21868094ca658a67bbcabd97f969bd9e17
parents 62790dbe 904e3349

core/java/android/os/Trace.java

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

    public static final long TRACE_TAG_VIBRATOR = 1L << 23;

    /** @hide */

    /** @hide */

    public static final long TRACE_TAG_AIDL = 1L << 24;

    public static final long TRACE_TAG_AIDL = 1L << 24;

    /** @hide */

    public static final long TRACE_TAG_NNAPI = 1L << 25;





    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;