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

Commit df6f4239 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "Add support to Java for RS tracing."

parents 9d6ee7ec 6d7a53cb

core/java/android/os/Trace.java

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

    /** @hide */

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

    /** @hide */

    public static final long TRACE_TAG_RS = 1L << 15;



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

    private static final int MAX_SECTION_NAME_LEN = 127;

graphics/java/android/renderscript/Allocation.java

+89 −3

File changed.

Preview size limit exceeded, changes collapsed.

graphics/java/android/renderscript/RenderScript.java

+3 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ import android.os.Process; 
import android.util.Log;

import android.view.Surface;

import android.os.SystemProperties;





import android.os.Trace;



/**

 * Renderscript base master class.  An instance of this class creates native
@@ -46,6 +45,8 @@ import android.os.SystemProperties; 
 * </div>

 **/

public class RenderScript {

    static final long TRACE_TAG = Trace.TRACE_TAG_RS;



    static final String LOG_TAG = "RenderScript_jni";

    static final boolean DEBUG  = false;

    @SuppressWarnings({"UnusedDeclaration", "deprecation"})