Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow vril-dump to work on user builds" into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-07-06 12:08:05 -07:00
committed by Android (Google) Code Review
parent bc45fcbb44 790d2e4d69
commit 97667d0cb3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmds/dumpstate/dumpstate.c
View File

@@ -47,9 +47,11 @@ static void dumpstate() {
char build[PROPERTY_VALUE_MAX], fingerprint[PROPERTY_VALUE_MAX]; char build[PROPERTY_VALUE_MAX], fingerprint[PROPERTY_VALUE_MAX];
char radio[PROPERTY_VALUE_MAX], bootloader[PROPERTY_VALUE_MAX]; char radio[PROPERTY_VALUE_MAX], bootloader[PROPERTY_VALUE_MAX];
char network[PROPERTY_VALUE_MAX], date[80]; char network[PROPERTY_VALUE_MAX], date[80];
char build_type[PROPERTY_VALUE_MAX];
property_get("ro.build.display.id", build, "(unknown)"); property_get("ro.build.display.id", build, "(unknown)");
property_get("ro.build.fingerprint", fingerprint, "(unknown)"); property_get("ro.build.fingerprint", fingerprint, "(unknown)");
property_get("ro.build.type", build_type, "(unknown)");
property_get("ro.baseband", radio, "(unknown)"); property_get("ro.baseband", radio, "(unknown)");
property_get("ro.bootloader", bootloader, "(unknown)"); property_get("ro.bootloader", bootloader, "(unknown)");
property_get("gsm.operator.alpha", network, "(unknown)"); property_get("gsm.operator.alpha", network, "(unknown)");
@@ -126,9 +128,17 @@ static void dumpstate() {
char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0}; char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30"); property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");
if (strlen(ril_dumpstate_timeout) > 0) { if (strnlen(ril_dumpstate_timeout, PROPERTY_VALUE_MAX - 1) > 0) {
run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout), if (0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1)) {
"su", "root", "vril-dump", NULL); // su does not exist on user builds, so try running without it.
// This way any implementations of vril-dump that do not require
// root can run on user builds.
run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout),
"vril-dump", NULL);
} else {
run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout),
"su", "root", "vril-dump", NULL);
}
} }
print_properties(); print_properties();
@@ -264,7 +274,7 @@ int main(int argc, char *argv[]) {
if (getuid() == 0) { if (getuid() == 0) {
/* switch to non-root user and group */ /* switch to non-root user and group */
gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT }; gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT, AID_INET };
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) { if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
LOGE("Unable to setgroups, aborting: %s\n", strerror(errno)); LOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
return -1; return -1;