From 9fcaaba85ddee7ca181901b7409ef3eb2962a7d8 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 18 Apr 2017 08:43:16 -0700 Subject: [PATCH] liblog: __android_logger_property_bool svelte+eng default When BOOL_DEFAULT_FLAG_ENG and/or BOOL_DEFAULT_FLAG_SVELTE is set for flags parameter in __android_logger_property_get_bool, they can not be overridden by a supplied property value. Reset these two flags if there is something in the specified property. Test: gTest liblog-unit-tests, logcat-unit-tests and logd-unit-tests Bug: 37425809 Change-Id: I5fc2d727e8c30bc1e781f8b365f44ec62dd36b4d --- liblog/properties.c | 3 +++ 1 file changed, 3 insertions(+) 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, if (check_flag(property.property, "false")) { return false; } + if (property.property[0]) { + flag &= ~(BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE); + } if (check_flag(property.property, "eng")) { flag |= BOOL_DEFAULT_FLAG_ENG; }