commit 97787a00e6aeb9aba2d744566cfd9de3d2f8c4f6
author Mark Salyzyn <salyzyn@google.com> Mon Mar 28 15:52:13 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Oct 14 11:12:24 2016 -0700
tree a0ac79544c637b378d026f12efff19092d2b1c42
parent dafe384207ea30278f14b8f6f40328d996d2b9ac

adb: use __android_log_is_debuggable()

Test: compile and months of adb functionality use
Bug: 27566046
Bug: 31456426
Change-Id: I6568eea0eda8dc67dec2ba34cd4c3f56fb0ff0e9

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 0c3dd00..2fbc15a 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -38,8 +38,9 @@
 #include <cutils/sockets.h>
 
 #if !ADB_HOST
-#include "cutils/android_reboot.h"
 #include <android-base/properties.h>
+#include <cutils/android_reboot.h>
+#include <private/android_logger.h>
 #endif
 
 #include "adb.h"
@@ -73,7 +74,7 @@
         WriteFdExactly(fd, "adbd is already running as root\n");
         adb_close(fd);
     } else {
-        if (!android::base::GetBoolProperty("ro.debuggable", false)) {
+        if (!__android_log_is_debuggable()) {
             WriteFdExactly(fd, "adbd cannot run as root in production builds\n");
             adb_close(fd);
             return;