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

Commit 3a9c7161 authored by Jeff Hao's avatar Jeff Hao Committed by Android Git Automerger
Browse files

am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for... 

am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev

* commit '6627e5b2':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
parents 64582578 6627e5b2

core/java/android/ddm/DdmHandleProfiling.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class DdmHandleProfiling extends ChunkHandler { 
     * Handle a "Method PRofiling Query" request.

     */

    private Chunk handleMPRQ(Chunk request) {

        int result = Debug.isMethodTracingActive() ? 1 : 0;

        int result = Debug.getMethodTracingMode();



        /* create a non-empty reply so the handler fires on completion */

        byte[] reply = { (byte) result };

core/java/android/os/Debug.java

+5 −3
Original line number Diff line number Diff line
@@ -645,11 +645,13 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo 
    }



    /**

     * Determine whether method tracing is currently active.

     * Determine whether method tracing is currently active and what type is

     * active.

     *

     * @hide

     */

    public static boolean isMethodTracingActive() {

        return VMDebug.isMethodTracingActive();

    public static int getMethodTracingMode() {

        return VMDebug.getMethodTracingMode();

    }



    /**