diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-17 23:12:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-17 23:12:10 +0000 |
| commit | 3ad0af6d0422b1659ad6912802693cffd45be3b9 (patch) | |
| tree | 03403563186b1396d6c422692d4d0c6ca42c1c80 /logd | |
| parent | 0516aded0e3006272ec390fd418d311e06b1d328 (diff) | |
| parent | 99f47a9e7c4374f2bbfc18e4a97aa7848245ea33 (diff) | |
| download | system_core-3ad0af6d0422b1659ad6912802693cffd45be3b9.zip system_core-3ad0af6d0422b1659ad6912802693cffd45be3b9.tar.gz system_core-3ad0af6d0422b1659ad6912802693cffd45be3b9.tar.bz2 | |
Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/LogBuffer.cpp | 2 | ||||
| -rw-r--r-- | logd/tests/logd_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index 70f3e91..8dcab87 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -165,7 +165,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows) { size_t worst_sizes = 0; size_t second_worst_sizes = 0; - if (mPrune.worstUidEnabled()) { + if ((id != LOG_ID_CRASH) && mPrune.worstUidEnabled()) { LidStatistics &l = stats.id(id); UidStatisticsCollection::iterator iu; for (iu = l.begin(); iu != l.end(); ++iu) { diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp index 70f8fe9..9ad8973 100644 --- a/logd/tests/logd_test.cpp +++ b/logd/tests/logd_test.cpp @@ -31,7 +31,7 @@ */ static void my_android_logger_get_statistics(char *buf, size_t len) { - snprintf(buf, len, "getStatistics 0 1 2 3"); + snprintf(buf, len, "getStatistics 0 1 2 3 4"); int sock = socket_local_client("logd", ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM); |