diff options
| author | Christopher Tate <ctate@google.com> | 2012-01-03 17:44:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-03 17:44:09 -0800 |
| commit | 20eaf4c1a41ee56998086769122917b016181630 (patch) | |
| tree | f502bdf7c9074220b64f9ca68a39d7dd4d4ef591 /docs | |
| parent | 1ad47b47bcd9f399db91e633e264a0d40a9948a3 (diff) | |
| parent | 91582b86d918b80158654671933cf26c96c34747 (diff) | |
| download | frameworks_base-20eaf4c1a41ee56998086769122917b016181630.zip frameworks_base-20eaf4c1a41ee56998086769122917b016181630.tar.gz frameworks_base-20eaf4c1a41ee56998086769122917b016181630.tar.bz2 | |
am 91582b86: am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '91582b86d918b80158654671933cf26c96c34747':
Tweak docs on 'adb logcat'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/developing/debugging/debugging-log.jd | 13 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/adb.jd | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/html/guide/developing/debugging/debugging-log.jd b/docs/html/guide/developing/debugging/debugging-log.jd index 295772d..b5b626e 100644 --- a/docs/html/guide/developing/debugging/debugging-log.jd +++ b/docs/html/guide/developing/debugging/debugging-log.jd @@ -221,19 +221,20 @@ export ANDROID_LOG_TAGS="ActivityManager:I MyApp:D *:S" below.</p> <ul> - <li><code>brief</code> — Display priority/tag and PID of originating process (the default - format).</li> + <li><code>brief</code> — Display priority/tag and PID of the process issuing the + message (the default format).</li> <li><code>process</code> — Display PID only.</li> <li><code>tag</code> — Display the priority/tag only.</li> - <li><code>thread</code> — Display process:thread and priority/tag only.</li> - <li><code>raw</code> — Display the raw log message, with no other metadata fields.</li> <li><code>time</code> — Display the date, invocation time, priority/tag, and PID of the - originating process.</li> + process issuing the message.</li> + + <li><code>threadtime</code> — Display the date, invocation time, priority, tag, and + the PID and TID of the thread issuing the message.</li> <li><code>long</code> — Display all metadata fields and separate messages with blank lines.</li> @@ -304,4 +305,4 @@ $ adb shell start <p> If you're developing a web application for Android, you can debug your JavaScript using the console JavaScript APIs, which output messages to LogCat. For more information, see - <a href="{@docRoot}guide/webapps/debugging.html">Debugging Web Apps</a>.</p>
\ No newline at end of file + <a href="{@docRoot}guide/webapps/debugging.html">Debugging Web Apps</a>.</p> diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd index d32cf66..50c7236 100644 --- a/docs/html/guide/developing/tools/adb.jd +++ b/docs/html/guide/developing/tools/adb.jd @@ -546,12 +546,12 @@ of each message, given as <code><priority>/<tag></code>. </p> <p>Log messages contain a number of metadata fields, in addition to the tag and priority. You can modify the output format for messages so that they display a specific metadata field. To do so, you use the <code>-v</code> option and specify one of the supported output formats listed below. </p> <ul> - <li><code>brief</code> — Display priority/tag and PID of originating process (the default format).</li> + <li><code>brief</code> — Display priority/tag and the PID of process issuing the message (the default format).</li> <li><code>process</code> — Display PID only.</li> <li><code>tag</code> — Display the priority/tag only. </li> - <li><code>thread</code> — Display process:thread and priority/tag only. </li> <li><code>raw</code> — Display the raw log message, with no other metadata fields.</li> - <li><code>time</code> — Display the date, invocation time, priority/tag, and PID of the originating process.</li> + <li><code>time</code> — Display the date, invocation time, priority/tag, and PID of the process issuing the message.</li> + <li><code>threadtime</code> — Display the date, invocation time, priority, tag, and the PID and TID of the thread issuing the message.</li> <li><code>long</code> — Display all metadata fields and separate messages with a blank lines.</li> </ul> |