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

Commit 535164e9 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Reimplement the "adb root" command to more closely match its previous behavior 



The adb gadget driver used to reset the USB bus when the adbd daemon exited,
and the host side adb relied on this behavior to force it to reconnect
with the new adbd instance after init relaunches it.  The new gadget
drivers no longer automatically reset the USB bus when adbd is restarted
which caused adb to hang since it was no longer forced to reconnect with the
device.  We attempted to work around this on the host side adb, but that
work around has not been reliable.

This change adds a property trigger on the service.adb.root system property
which will reset the USB bus and restart the adbd daemon when adbd sets
the property to 1.  This should be much closer to the previous behavior
and will hopefully fix some problems with automated testing.

Change-Id: I177c37400009a3d83f21a5f9431f94fd1cc19b9b
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 07edefe4

adb/services.c

+2 −4
Original line number Diff line number Diff line
@@ -125,14 +125,12 @@ void restart_root_service(int fd, void *cookie) 
            return;

        }



        property_set("service.adb.root", "1");

        snprintf(buf, sizeof(buf), "restarting adbd as root\n");

        writex(fd, buf, strlen(buf));

        adb_close(fd);



        // quit, and init will restart us as root

        sleep(1);

        exit(1);

        // This will cause a property trigger in init.rc to restart us

        property_set("service.adb.root", "1");

    }

}

rootdir/init.rc

+12 −0
Original line number Diff line number Diff line
@@ -375,6 +375,18 @@ service adbd /sbin/adbd 
on property:ro.kernel.qemu=1

    start adbd



# This property trigger has added to imitiate the previous behavior of "adb root".

# The adb gadget driver used to reset the USB bus when the adbd daemon exited,

# and the host side adb relied on this behavior to force it to reconnect with the

# new adbd instance after init relaunches it. So now we force the USB bus to reset

# here when adbd sets the service.adb.root property to 1.  We also restart adbd here

# rather than waiting for init to notice its death and restarting it so the timing

# of USB resetting and adb restarting more closely matches the previous behavior.

on property:service.adb.root=1

    write /sys/class/android_usb/android0/enable 0

    restart adbd

    write /sys/class/android_usb/android0/enable 1



service servicemanager /system/bin/servicemanager

    class core

    user system