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

Merge "Add support for int64, float, double types to service command."

Browse Source
This commit is contained in:
Jeff Brown 2015-04-07 03:50:29 +00:00 committed by Android (Google) Code Review
commit 969baf52d9
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmds/service/service.cpp
View File

@ -146,6 +146,15 @@ int main(int argc, char* const argv[])
break; break;
} }
data.writeInt32(atoi(argv[optind++])); data.writeInt32(atoi(argv[optind++]));
} else if (strcmp(argv[optind], "i64") == 0) {
optind++;
if (optind >= argc) {
aerr << "service: no integer supplied for 'i64'" << endl;
wantsUsage = true;
result = 10;
break;
}
data.writeInt64(atoll(argv[optind++]));
} else if (strcmp(argv[optind], "s16") == 0) { } else if (strcmp(argv[optind], "s16") == 0) {
optind++; optind++;
if (optind >= argc) { if (optind >= argc) {
@ -155,6 +164,24 @@ int main(int argc, char* const argv[])
break; break;
} }
data.writeString16(String16(argv[optind++])); data.writeString16(String16(argv[optind++]));
} else if (strcmp(argv[optind], "f") == 0) {
optind++;
if (optind >= argc) {
aerr << "service: no number supplied for 'f'" << endl;
wantsUsage = true;
result = 10;
break;
}
data.writeFloat(atof(argv[optind++]));
} else if (strcmp(argv[optind], "d") == 0) {
optind++;
if (optind >= argc) {
aerr << "service: no number supplied for 'd'" << endl;
wantsUsage = true;
result = 10;
break;
}
data.writeDouble(atof(argv[optind++]));
} else if (strcmp(argv[optind], "null") == 0) { } else if (strcmp(argv[optind], "null") == 0) {
optind++; optind++;
data.writeStrongBinder(NULL); data.writeStrongBinder(NULL);
@ -272,9 +299,12 @@ int main(int argc, char* const argv[])
aout << "Usage: service [-h|-?]\n" aout << "Usage: service [-h|-?]\n"
" service list\n" " service list\n"
" service check SERVICE\n" " service check SERVICE\n"
" service call SERVICE CODE [i32 INT | s16 STR] ...\n" " service call SERVICE CODE [i32 N | i64 N | f N | d N | s16 STR ] ...\n"
"Options:\n" "Options:\n"
" i32: Write the integer INT into the send parcel.\n" " i32: Write the 32-bit integer N into the send parcel.\n"
" i64: Write the 64-bit integer N into the send parcel.\n"
" f: Write the 32-bit single-precision number N into the send parcel.\n"
" d: Write the 64-bit double-precision number N into the send parcel.\n"
" s16: Write the UTF-16 string STR into the send parcel.\n"; " s16: Write the UTF-16 string STR into the send parcel.\n";
// " intent: Write and Intent int the send parcel. ARGS can be\n" // " intent: Write and Intent int the send parcel. ARGS can be\n"
// " action=STR data=STR type=STR launchFlags=INT component=STR categories=STR[,STR,...]\n"; // " action=STR data=STR type=STR launchFlags=INT component=STR categories=STR[,STR,...]\n";