Skip to content

Commit

Permalink
Remove obsolete vdc call.
Browse files Browse the repository at this point in the history
Since ca8e66a, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc...

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
  • Loading branch information
nickkral authored and hyperb1iss committed May 5, 2014
1 parent d8b8cfa commit 6cc5150
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
3 changes: 1 addition & 2 deletions adb/adb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1335,12 +1335,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);
}
Expand Down
15 changes: 1 addition & 14 deletions adb/services.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,23 +129,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);
Expand Down

0 comments on commit 6cc5150

Please sign in to comment.