diff options
author | Jeff Hao <jeffhao@google.com> | 2013-08-30 22:17:12 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-30 22:17:12 +0000 |
commit | 6110d16b8dd08d276902d2c6d8e90562a3d3694d (patch) | |
tree | f1c2cb4422e9124cfbee80c8c5d162192133bc2f | |
parent | 39e885dc821fbfade43423fae712f82b1df08467 (diff) | |
parent | 6f0a04f5d2fbd9507bcb1b4e766623d444503ae5 (diff) | |
download | base-6110d16b8dd08d276902d2c6d8e90562a3d3694d.tar.gz |
Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks."
-rw-r--r-- | core/java/android/ddm/DdmHandleProfiling.java | 2 | ||||
-rw-r--r-- | core/java/android/os/Debug.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/ddm/DdmHandleProfiling.java b/core/java/android/ddm/DdmHandleProfiling.java index f4011eda89d8..537763dae99a 100644 --- a/core/java/android/ddm/DdmHandleProfiling.java +++ b/core/java/android/ddm/DdmHandleProfiling.java @@ -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 }; diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 5de12727b788..989bd2c75332 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -524,11 +524,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(); } /** |