tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '77a2c22dcbab56b260eb9d39c84fe8f98258cebb':
  adbd: adb root should terminate adbd only if it's debuggable
This commit is contained in:
Badhri Jagan Sridharan 2014-07-10 00:08:35 +00:00 committed by Android Git Automerger
commit 87c7a0d74b
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/sockets.c
View file

@ -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 *create_local_service_socket(const char *name)
{
asocket *s;
int fd;
#if !ADB_HOST
char debug[PROPERTY_VALUE_MAX];
#endif
#if !ADB_HOST
if (!strcmp(name,"jdwp")) {
@ -444,7 +451,11 @@ asocket *create_local_service_socket(const char *name)
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);