commit 87c7a0d74b9dadaedfe6805c57d221d9c445aaf6
author Badhri Jagan Sridharan <badhri@google.com> Thu Jul 10 00:08:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 10 00:08:35 2014 +0000
tree 453d8ab87b8cfb0825557094c35fe85903d941d3
parent d0fa7342c536180519ddc475fbf6f5219b0424d9
parent 77a2c22dcbab56b260eb9d39c84fe8f98258cebb

am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"

* commit '77a2c22dcbab56b260eb9d39c84fe8f98258cebb':
  adbd: adb root should terminate adbd only if it's debuggable

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index de14a22..faa9564 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -23,6 +23,10 @@
 
 #include "sysdeps.h"
 
+#if !ADB_HOST
+#include <cutils/properties.h>
+#endif
+
 #define  TRACE_TAG  TRACE_SOCKETS
 #include "adb.h"
 
@@ -428,6 +432,9 @@
 {
     asocket *s;
     int fd;
+#if !ADB_HOST
+    char debug[PROPERTY_VALUE_MAX];
+#endif
 
 #if !ADB_HOST
     if (!strcmp(name,"jdwp")) {
@@ -444,7 +451,11 @@
     D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);
 
 #if !ADB_HOST
-    if ((!strncmp(name, "root:", 5) && getuid() != 0)
+    if (!strncmp(name, "root:", 5))
+        property_get("ro.debuggable", debug, "");
+
+    if ((!strncmp(name, "root:", 5) && getuid() != 0
+        && strcmp(debug, "1") == 0)
         || !strncmp(name, "usb:", 4)
         || !strncmp(name, "tcpip:", 6)) {
         D("LS(%d): enabling exit_on_close\n", s->id);