Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7be1e8 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Android Git Automerger
Browse files

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

* commit '87c7a0d7':
  adbd: adb root should terminate adbd only if it's debuggable
parents 75b3d8c0 87c7a0d7

adb/sockets.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ 




#include "sysdeps.h"

#include "sysdeps.h"





#if !ADB_HOST

#include <cutils/properties.h>

#endif



#define  TRACE_TAG  TRACE_SOCKETS

#define  TRACE_TAG  TRACE_SOCKETS

#include "adb.h"

#include "adb.h"
@@ -428,6 +432,9 @@ asocket *create_local_service_socket(const char *name) 
{

{

    asocket *s;

    asocket *s;

    int fd;

    int fd;

#if !ADB_HOST

    char debug[PROPERTY_VALUE_MAX];

#endif





#if !ADB_HOST

#if !ADB_HOST

    if (!strcmp(name,"jdwp")) {

    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);

    D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);





#if !ADB_HOST

#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, "usb:", 4)

        || !strncmp(name, "tcpip:", 6)) {

        || !strncmp(name, "tcpip:", 6)) {

        D("LS(%d): enabling exit_on_close\n", s->id);

        D("LS(%d): enabling exit_on_close\n", s->id);