diff options
| author | Jeff Hao <jeffhao@google.com> | 2013-08-30 21:10:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-30 21:10:40 +0000 |
| commit | 6627e5b2aef2783cfa505a48195d7b8153eda25c (patch) | |
| tree | 332d45ed76c0e6f2760255c80b6b5368dbc902b9 /core/java | |
| parent | 655cff1799c3b7cce616676500e38bf43f83bc34 (diff) | |
| parent | ac27705f75e74f022de8c7888b14b49fed899176 (diff) | |
| download | frameworks_base-6627e5b2aef2783cfa505a48195d7b8153eda25c.zip frameworks_base-6627e5b2aef2783cfa505a48195d7b8153eda25c.tar.gz frameworks_base-6627e5b2aef2783cfa505a48195d7b8153eda25c.tar.bz2 | |
Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev
Diffstat (limited to 'core/java')
| -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 e1d359c..ec08393 100644 --- a/core/java/android/ddm/DdmHandleProfiling.java +++ b/core/java/android/ddm/DdmHandleProfiling.java @@ -186,7 +186,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 b78bbc3..60ce132 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -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(); } /** |