summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2016-08-03 10:42:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-08-03 10:42:37 +0000
commit258a554f6299749322750a286d802267c240ec31 (patch)
treed0e2aba2976176bfe12af8787f941a433cae8da4 /core/java/android
parentd13954e8c6de5ade53534c3722b592c9d654208b (diff)
parent8ad86a3d1a1378362ffa4217dca609e3556cf72a (diff)
Merge "Stop profiling on uncaught exception."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityThread.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 0386cff9edea..5cffb780c69f 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4294,6 +4294,16 @@ public final class ActivityThread {
}
}
+ /**
+ * Public entrypoint to stop profiling. This is required to end profiling when the app crashes,
+ * so that profiler data won't be lost.
+ *
+ * @hide
+ */
+ public void stopProfiling() {
+ mProfiler.stopProfiling();
+ }
+
static final void handleDumpHeap(boolean managed, DumpHeapData dhd) {
if (managed) {
try {