diff options
| -rw-r--r-- | adb/adb.c | 3 | ||||
| -rw-r--r-- | adb/services.c | 15 | ||||
| -rw-r--r-- | charger/charger.c | 11 |
3 files changed, 5 insertions, 24 deletions
@@ -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); } diff --git a/adb/services.c b/adb/services.c index 951048e..89e595c 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); diff --git a/charger/charger.c b/charger/charger.c index dda24ae..66ddeaf 100644 --- a/charger/charger.c +++ b/charger/charger.c @@ -67,7 +67,6 @@ #define BATTERY_FULL_THRESH 95 #define LAST_KMSG_PATH "/proc/last_kmsg" -#define LAST_KMSG_PSTORE_PATH "/sys/fs/pstore/console-ramoops" #define LAST_KMSG_MAX_SZ (32 * 1024) #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0) @@ -212,14 +211,10 @@ static void dump_last_kmsg(void) LOGI("\n"); LOGI("*************** LAST KMSG ***************\n"); LOGI("\n"); - buf = load_file(LAST_KMSG_PSTORE_PATH, &sz); - + buf = load_file(LAST_KMSG_PATH, &sz); if (!buf || !sz) { - buf = load_file(LAST_KMSG_PATH, &sz); - if (!buf || !sz) { - LOGI("last_kmsg not found. Cold reset?\n"); - goto out; - } + LOGI("last_kmsg not found. Cold reset?\n"); + goto out; } len = min(sz, LAST_KMSG_MAX_SZ); |