commit 9864e84beb51d1c0ba0fb1eebb6dd60d95573aae
author Mark Salyzyn <salyzyn@google.com> Wed Apr 19 16:09:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 16:09:39 2017 +0000
tree 0bc2b4b234249f2d3c9513c9ec3607638c55e737
parent c930fed0c94b5505d8dbf0bfb9a11af14bf4c869
parent 43c04820f9d8bc024c73674407a5d50fb97f3329

Merge "liblog: __android_logger_property_bool svelte+eng default"
am: 8b318d0c26

Change-Id: I57810f41f8eff2cdbf943613d1fb5acbbcc53469

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;
   }