commit a9cea06ec5b6482a6004f89bdf67aafe309916bf
author Mark Salyzyn <salyzyn@google.com> Tue Oct 18 16:53:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 16:53:38 2016 +0000
tree bcfade6b765546fc188618f878e3e764176008d0
parent ca76e4c7137230dd4d0828a0bd1f595bfd9b55c9
parent a6633bd5bef95feaf3088006a17a82438e7d369d

logd: use __android_log_is_debuggable() am: 5740a46e4e
am: f606721b59

Change-Id: Ib1c9a9f876aac13dcc6499a43fe09fd20467121c

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index a0cea25..c47f396 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -44,6 +44,7 @@
 #include <log/event_tag_map.h>
 #include <packagelistparser/packagelistparser.h>
 #include <private/android_filesystem_config.h>
+#include <private/android_logger.h>
 #include <scoped_minijail.h>
 #include <utils/threads.h>
 
@@ -174,11 +175,8 @@
                                  BOOL_DEFAULT_FALSE)) {
         return false;
     }
-    if (flag & BOOL_DEFAULT_FLAG_ENG) {
-        property_get("ro.debuggable", property, "");
-        if (strcmp(property, "1")) {
-            return false;
-        }
+    if ((flag & BOOL_DEFAULT_FLAG_ENG) && !__android_log_is_debuggable()) {
+        return false;
     }
 
     return (flag & BOOL_DEFAULT_FLAG_TRUE_FALSE) != BOOL_DEFAULT_FALSE;