summaryrefslogtreecommitdiffstats
path: root/logd
diff options
context:
space:
mode:
authorSiarhei Vishniakou <svv@google.com>2017-12-28 14:13:22 -0800
committerSiarhei Vishniakou <svv@google.com>2018-01-02 10:47:50 -0800
commite8ed36b6b3b685a73361a1005f94d5ba0f1fb121 (patch)
treeec181770f366368ac69c897b8d7898077d48005d /logd
parent93d344d98cd02d66c3aac8067718be828ea283f9 (diff)
downloadsystem_core-e8ed36b6b3b685a73361a1005f94d5ba0f1fb121.tar.gz
system_core-e8ed36b6b3b685a73361a1005f94d5ba0f1fb121.tar.bz2
system_core-e8ed36b6b3b685a73361a1005f94d5ba0f1fb121.zip
Use ro.logd.kernel for kernel logcat
Prevent a possible DOS of the kernel logs because the runtime result could differ from the boottime result. Test: adb bugreport, then examine kernel log Change-Id: I140fd465f2e691c751d92af50dbdf95e23c121d8
Diffstat (limited to 'logd')
-rw-r--r--logd/README.property6
-rw-r--r--logd/main.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/logd/README.property b/logd/README.property
index de6767ad5..da5f96fb7 100644
--- a/logd/README.property
+++ b/logd/README.property
@@ -31,9 +31,9 @@ ro.logd.size number svelte default for persist.logd.size. Larger
resist increasing the log buffer.
persist.logd.size.<buffer> number ro Size of the buffer for <buffer> log
ro.logd.size.<buffer> number svelte default for persist.logd.size.<buffer>
-ro.config.low_ram bool false if true, logd.statistics, logd.kernel
- default false, logd.size 64K instead
- of 256K.
+ro.config.low_ram bool false if true, logd.statistics,
+ ro.logd.kernel default false,
+ logd.size 64K instead of 256K.
persist.logd.filter string Pruning filter to optimize content.
At runtime use: logcat -P "<string>"
ro.logd.filter string "~! ~1000/!" default for persist.logd.filter.
diff --git a/logd/main.cpp b/logd/main.cpp
index c8183f0e7..4af0d21f1 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -438,8 +438,8 @@ int main(int argc, char* argv[]) {
int fdPmesg = -1;
bool klogd = __android_logger_property_get_bool(
- "logd.kernel", BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_PERSIST |
- BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE);
+ "ro.logd.kernel",
+ BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE);
if (klogd) {
static const char proc_kmsg[] = "/proc/kmsg";
fdPmesg = android_get_control_file(proc_kmsg);