ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 09a22fc2: Merge "Allow disable of dumpstate vibrate"

Browse Source 
* commit '09a22fc29d588b173e5c0dd2002ac2c44d45b7c6':
  Allow disable of dumpstate vibrate
This commit is contained in:
jp abgrall 2012-09-17 10:58:38 -07:00 committed by Android Git Automerger
commit e917bfbd19
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmds/dumpstate/dumpstate.c
View File

@ -292,7 +292,7 @@ static void dumpstate() {
} }
static void usage() { static void usage() {
fprintf(stderr, "usage: dumpstate [-b soundfile] [-e soundfile] [-o file [-d] [-p] [-z]] [-s]\n" fprintf(stderr, "usage: dumpstate [-b soundfile] [-e soundfile] [-o file [-d] [-p] [-z]] [-s] [-q]\n"
" -o: write to file (instead of stdout)\n" " -o: write to file (instead of stdout)\n"
" -d: append date to filename (requires -o)\n" " -d: append date to filename (requires -o)\n"
" -z: gzip output (requires -o)\n" " -z: gzip output (requires -o)\n"
@ -300,12 +300,14 @@ static void usage() {
" -s: write output to control socket (for init)\n" " -s: write output to control socket (for init)\n"
" -b: play sound file instead of vibrate, at beginning of job\n" " -b: play sound file instead of vibrate, at beginning of job\n"
" -e: play sound file instead of vibrate, at end of job\n" " -e: play sound file instead of vibrate, at end of job\n"
" -q: disable vibrate\n"
); );
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int do_add_date = 0; int do_add_date = 0;
int do_compress = 0; int do_compress = 0;
int do_vibrate = 1;
char* use_outfile = 0; char* use_outfile = 0;
char* begin_sound = 0; char* begin_sound = 0;
char* end_sound = 0; char* end_sound = 0;
@ -328,7 +330,7 @@ int main(int argc, char *argv[]) {
dump_traces_path = dump_traces(); dump_traces_path = dump_traces();
int c; int c;
while ((c = getopt(argc, argv, "b:de:ho:svzp")) != -1) { while ((c = getopt(argc, argv, "b:de:ho:svqzp")) != -1) {
switch (c) { switch (c) {
case 'b': begin_sound = optarg; break; case 'b': begin_sound = optarg; break;
case 'd': do_add_date = 1; break; case 'd': do_add_date = 1; break;
@ -336,6 +338,7 @@ int main(int argc, char *argv[]) {
case 'o': use_outfile = optarg; break; case 'o': use_outfile = optarg; break;
case 's': use_socket = 1; break; case 's': use_socket = 1; break;
case 'v': break; // compatibility no-op case 'v': break; // compatibility no-op
case 'q': do_vibrate = 0; break;
case 'z': do_compress = 6; break; case 'z': do_compress = 6; break;
case 'p': do_fb = 1; break; case 'p': do_fb = 1; break;
case '?': printf("\n"); case '?': printf("\n");
@ -345,9 +348,12 @@ int main(int argc, char *argv[]) {
} }
} }
/* open the vibrator before dropping root */ FILE *vibrator = 0;
FILE *vibrator = fopen("/sys/class/timed_output/vibrator/enable", "w"); if (do_vibrate) {
if (vibrator) fcntl(fileno(vibrator), F_SETFD, FD_CLOEXEC); /* open the vibrator before dropping root */
vibrator = fopen("/sys/class/timed_output/vibrator/enable", "w");
if (vibrator) fcntl(fileno(vibrator), F_SETFD, FD_CLOEXEC);
}
/* read /proc/cmdline before dropping root */ /* read /proc/cmdline before dropping root */
FILE *cmdline = fopen("/proc/cmdline", "r"); FILE *cmdline = fopen("/proc/cmdline", "r");