commit e835d3c53edfe39b6fba027380bed4ab3c6f46cf
author Mark Salyzyn <salyzyn@google.com> Tue Apr 18 08:43:16 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Wed Apr 19 08:24:31 2017 -0700
tree d7528946de25a388cfd45cfe0b234636841fe8c8
parent 519d35fa067227518d5101f8636d5ea4ee77b42b

liblog: __android_logger_property_bool svelte+eng default

(cherry pick from commit 9fcaaba85ddee7ca181901b7409ef3eb2962a7d8)

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

diff --git a/liblog/properties.c b/liblog/properties.c
index c71cbcf..11be827 100644
--- a/liblog/properties.c
+++ b/liblog/properties.c
@@ -459,6 +459,9 @@
   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;
   }