commit 62068bfb4a78506f4f101b26c994e5ad7026fb54
author Tom Cherry <tomcherry@google.com> Tue Jul 28 11:55:30 2020 -0700
committer Tom Cherry <tomcherry@google.com> Wed Jul 29 19:58:30 2020 +0000
tree 0be2014fd78bee5b7c68821dd0c99065094fc329
parent 68261eec2442f25a223faac2b3601a87021ea72a

liblog: remove __android_logger_property_get_bool()

All users have been moved to other, more suitable, interfaces.

Test: build
Merged-In: Ic4eb1f0ed6e35d8d6f7e63b80546f4e8bbe163e2
Change-Id: Ic4eb1f0ed6e35d8d6f7e63b80546f4e8bbe163e2

liblog/properties.cpp

diff --git a/liblog/properties.cpp b/liblog/properties.cpp
index bb64008..2a30a0b 100644
--- a/liblog/properties.cpp
+++ b/liblog/properties.cpp
@@ -390,21 +390,6 @@
  * need not guess our intentions.
  */
 
-/* Property helper */
-static bool check_flag(const char* prop, const char* flag) {
-  const char* cp = strcasestr(prop, flag);
-  if (!cp) {
-    return false;
-  }
-  /* We only will document comma (,) */
-  static const char sep[] = ",:;|+ \t\f";
-  if ((cp != prop) && !strchr(sep, cp[-1])) {
-    return false;
-  }
-  cp += strlen(flag);
-  return !*cp || !!strchr(sep, *cp);
-}
-
 /* cache structure */
 struct cache_property {
   struct cache cache;
@@ -422,56 +407,6 @@
   __system_property_read(cache->cache.pinfo, 0, cache->property);
 }
 
-/* get boolean with the logger twist that supports eng adjustments */
-bool __android_logger_property_get_bool(const char* key, int flag) {
-  struct cache_property property = {{NULL, 0xFFFFFFFF}, {0}};
-  if (flag & BOOL_DEFAULT_FLAG_PERSIST) {
-    char newkey[strlen("persist.") + strlen(key) + 1];
-    snprintf(newkey, sizeof(newkey), "ro.%s", key);
-    refresh_cache_property(&property, newkey);
-    property.cache.pinfo = NULL;
-    property.cache.serial = 0xFFFFFFFF;
-    snprintf(newkey, sizeof(newkey), "persist.%s", key);
-    refresh_cache_property(&property, newkey);
-    property.cache.pinfo = NULL;
-    property.cache.serial = 0xFFFFFFFF;
-  }
-
-  refresh_cache_property(&property, key);
-
-  if (check_flag(property.property, "true")) {
-    return true;
-  }
-  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;
-  }
-  /* this is really a "not" flag */
-  if (check_flag(property.property, "svelte")) {
-    flag |= BOOL_DEFAULT_FLAG_SVELTE;
-  }
-
-  if (flag & (BOOL_DEFAULT_FLAG_SVELTE | BOOL_DEFAULT_FLAG_ENG)) {
-    flag &= ~BOOL_DEFAULT_FLAG_TRUE_FALSE;
-    flag |= BOOL_DEFAULT_TRUE;
-  }
-
-  if ((flag & BOOL_DEFAULT_FLAG_SVELTE) &&
-      __android_logger_property_get_bool("ro.config.low_ram", BOOL_DEFAULT_FALSE)) {
-    return false;
-  }
-  if ((flag & BOOL_DEFAULT_FLAG_ENG) && !__android_log_is_debuggable()) {
-    return false;
-  }
-
-  return (flag & BOOL_DEFAULT_FLAG_TRUE_FALSE) != BOOL_DEFAULT_FALSE;
-}
-
 bool __android_logger_valid_buffer_size(unsigned long value) {
   return LOG_BUFFER_MIN_SIZE <= value && value <= LOG_BUFFER_MAX_SIZE;
 }
@@ -573,9 +508,12 @@
 
   default_size = do_cache2_property_size(&global);
   if (!default_size) {
-    default_size = __android_logger_property_get_bool("ro.config.low_ram", BOOL_DEFAULT_FALSE)
-                       ? LOG_BUFFER_MIN_SIZE /* 64K  */
-                       : LOG_BUFFER_SIZE;    /* 256K */
+    char value[PROP_VALUE_MAX] = {};
+    if (__system_property_get("ro.config.low_ram", value) == 0 || strcmp(value, "true") != 0) {
+      default_size = LOG_BUFFER_SIZE;
+    } else {
+      default_size = LOG_BUFFER_MIN_SIZE;
+    }
   }
 
   snprintf(key_persist, sizeof(key_persist), "%s.%s", global_tunable,