summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2018-07-27 19:23:33 -0700
committer android-build-merger <android-build-merger@google.com> 2018-07-27 19:23:33 -0700
commit908b70ed4cb2acf053dbab13bb6d4ecb4772c2cf (patch)
tree6884c0f6fea1b39aff332901c0313d73dc5827d9
parentd865b74f92fc2fc1dab95183e3de4c3021a9f7a6 (diff)
parent1a3e35fba27babff86bdaa960e044226a9f9e066 (diff)
Merge "Fix <android/trace.h> doxygen formatting." am: f8844c97ee
am: 1a3e35fba2 Change-Id: Ic7e31bc00ea5625dfabd68d67757f9fe3ddd6b12
-rw-r--r--include/android/trace.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/android/trace.h b/include/android/trace.h
index 43ace33802..0c4473230a 100644
--- a/include/android/trace.h
+++ b/include/android/trace.h
@@ -40,7 +40,7 @@ extern "C" {
#endif
/**
- * Returns true if tracing is enabled. Use this signal to avoid expensive computation only necessary
+ * Returns true if tracing is enabled. Use this to avoid expensive computation only necessary
* when tracing is enabled.
*
* Available since API level 23.
@@ -49,10 +49,10 @@ bool ATrace_isEnabled() __INTRODUCED_IN(23);
/**
* Writes a tracing message to indicate that the given section of code has begun. This call must be
- * followed by a corresponding call to endSection() on the same thread.
+ * followed by a corresponding call to {@link ATrace_endSection} on the same thread.
*
- * Note: At this time the vertical bar character '|' and newline character '\n' are used internally
- * by the tracing mechanism. If sectionName contains these characters they will be replaced with a
+ * Note: At this time the vertical bar character '|' and newline character '\\n' are used internally
+ * by the tracing mechanism. If \p sectionName contains these characters they will be replaced with a
* space character in the trace.
*
* Available since API level 23.
@@ -61,9 +61,9 @@ void ATrace_beginSection(const char* sectionName) __INTRODUCED_IN(23);
/**
* Writes a tracing message to indicate that a given section of code has ended. This call must be
- * preceeded by a corresponding call to beginSection(char*) on the same thread. Calling this method
+ * preceeded by a corresponding call to {@link ATrace_beginSection} on the same thread. Calling this method
* will mark the end of the most recently begun section of code, so care must be taken to ensure
- * that beginSection / endSection pairs are properly nested and called from the same thread.
+ * that {@link ATrace_beginSection}/{@link ATrace_endSection} pairs are properly nested and called from the same thread.
*
* Available since API level 23.
*/