summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorMark Salyzyn2017-04-19 09:55:19 -0500
committerGerrit Code Review2017-04-19 09:55:20 -0500
commit8b318d0c26c89acd7c716fb571bfd08d4393d12f (patch)
tree0bc2b4b234249f2d3c9513c9ec3607638c55e737 /liblog
parent0ca7eec9b0bbb1c636eb0278ff695e93450fd7d8 (diff)
parent9fcaaba85ddee7ca181901b7409ef3eb2962a7d8 (diff)
downloadplatform-system-core-8b318d0c26c89acd7c716fb571bfd08d4393d12f.tar.gz
platform-system-core-8b318d0c26c89acd7c716fb571bfd08d4393d12f.tar.xz
platform-system-core-8b318d0c26c89acd7c716fb571bfd08d4393d12f.zip
Merge "liblog: __android_logger_property_bool svelte+eng default"
Diffstat (limited to 'liblog')
-rw-r--r--liblog/properties.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/liblog/properties.c b/liblog/properties.c
index c71cbcfc1..11be8279f 100644
--- a/liblog/properties.c
+++ b/liblog/properties.c
@@ -459,6 +459,9 @@ LIBLOG_ABI_PRIVATE bool __android_logger_property_get_bool(const char* key,
459 if (check_flag(property.property, "false")) { 459 if (check_flag(property.property, "false")) {
460 return false; 460 return false;
461 } 461 }
462 if (property.property[0]) {
463 flag &= ~(BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE);
464 }
462 if (check_flag(property.property, "eng")) { 465 if (check_flag(property.property, "eng")) {
463 flag |= BOOL_DEFAULT_FLAG_ENG; 466 flag |= BOOL_DEFAULT_FLAG_ENG;
464 } 467 }