diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:21:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:21:53 +0000 |
| commit | 84240055f44d6507f2aaef421954a2d5f081da6e (patch) | |
| tree | 3cf95ff06fd36d4903cfdffb5b2eb00431bdfa76 | |
| parent | 5f1febdeef6fcddd9155f40e453b080d71502264 (diff) | |
| parent | ea03e1f8412903838b449871190e1279dc79e076 (diff) | |
| download | core-84240055f44d6507f2aaef421954a2d5f081da6e.tar.gz | |
Snap for 4824048 from ea03e1f8412903838b449871190e1279dc79e076 to pi-release
Change-Id: I0f4785f6e473990eb636cea655c7d1c78022de93
| -rw-r--r-- | liblog/tests/log_read_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/liblog/tests/log_read_test.cpp b/liblog/tests/log_read_test.cpp index 444a5ac64..443c3ea58 100644 --- a/liblog/tests/log_read_test.cpp +++ b/liblog/tests/log_read_test.cpp @@ -27,6 +27,7 @@ // Test the APIs in this standalone include file #include <log/log_read.h> // Do not use anything in log/log_time.h despite side effects of the above. +#include <private/android_logger.h> TEST(liblog, __android_log_write__android_logger_list_read) { #ifdef __ANDROID__ @@ -105,7 +106,10 @@ TEST(liblog, android_logger_get_) { // framework (b/68266385). EXPECT_LE( // boolean 1 or 0 depending on expected content or empty !!((strcmp("crash", name) != 0) && - ((strcmp("kernel", name) != 0) || __android_log_is_debuggable()) && + ((strcmp("kernel", name) != 0) || + __android_logger_property_get_bool( + "ro.logd.kernel", BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_ENG | + BOOL_DEFAULT_FLAG_SVELTE)) && (strcmp("stats", name) != 0)), android_logger_get_log_readable_size(logger)); } else { |