From 02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Tue, 14 Jan 2014 16:34:56 -0800 Subject: [PATCH] Remove obsolete vdc call. Since ca8e66a8b0f843812014a28d49208f9f6f64ecbc, init has been handling reboots and filesystem unmounts. Remove obsolete call to vdc. Bug: 12504045 Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881 (cherry picked from commit 225459a5da21e9397ca49b0d9af7d5fe3462706b) --- adb/adb.c | 3 +-- adb/services.c | 15 +-------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/adb/adb.c b/adb/adb.c index 72b7484af..99bea0f76 100644 --- a/adb/adb.c +++ b/adb/adb.c @@ -1313,12 +1313,11 @@ int adb_main(int is_daemon, int server_port) ** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump) ** AID_SDCARD_R to allow reading from the SD card ** AID_SDCARD_RW to allow writing to the SD card - ** AID_MOUNT to allow unmounting the SD card before rebooting ** AID_NET_BW_STATS to read out qtaguid statistics */ gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS, AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW, - AID_MOUNT, AID_NET_BW_STATS }; + AID_NET_BW_STATS }; if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) { exit(1); } diff --git a/adb/services.c b/adb/services.c index 951048e58..89e595c57 100644 --- a/adb/services.c +++ b/adb/services.c @@ -116,23 +116,10 @@ void reboot_service(int fd, void *arg) { char buf[100]; char property_val[PROPERTY_VALUE_MAX]; - int pid, ret; + int ret; sync(); - /* Attempt to unmount the SD card first. - * No need to bother checking for errors. - */ - pid = fork(); - if (pid == 0) { - /* ask vdc to unmount it */ - execl("/system/bin/vdc", "/system/bin/vdc", "volume", "unmount", - getenv("EXTERNAL_STORAGE"), "force", NULL); - } else if (pid > 0) { - /* wait until vdc succeeds or fails */ - waitpid(pid, &ret, 0); - } - ret = snprintf(property_val, sizeof(property_val), "reboot,%s", (char *) arg); if (ret >= (int) sizeof(property_val)) { snprintf(buf, sizeof(buf), "reboot string too long. length=%d\n", ret);