commit e4223e034cafea2ff8709ecf33cdd1fe028488af
author Mark Salyzyn <salyzyn@google.com> Wed Apr 19 16:19:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 16:19:31 2017 +0000
tree 8e9ef0a9e05df2e1b7be0b2a1b88b93432c623af
parent b0bf71f16611fb9f34a5b5b62ff4b6ce64936879
parent f58558d6b9117355e57ee1340f03ee6113d2edf6

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

Change-Id: I69168cf8ef5294dfb00742b5fc871c8f269cd6bb

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