ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Removes ASEC-related install flags"

Browse source
This commit is contained in:
Treehugger Robot 2018-12-07 18:11:09 +00:00 • committed by Gerrit Code Review
commit bcc2d60826
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/client/adb_install.cpp
View file

@ -226,18 +226,8 @@ static int install_app_streamed(int argc, const char** argv, bool use_fastdeploy
static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy, static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy,
bool use_localagent) { bool use_localagent) {
static const char* const DATA_DEST = "/data/local/tmp/%s";
static const char* const SD_DEST = "/sdcard/tmp/%s";
const char* where = DATA_DEST;
printf("Performing Push Install\n"); printf("Performing Push Install\n");
for (int i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-s")) {
where = SD_DEST;
}
}
// Find last APK argument. // Find last APK argument.
// All other arguments passed through verbatim. // All other arguments passed through verbatim.
int last_apk = -1; int last_apk = -1;
@ -256,7 +246,7 @@ static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy,
int result = -1; int result = -1;
std::vector<const char*> apk_file = {argv[last_apk]}; std::vector<const char*> apk_file = {argv[last_apk]};
std::string apk_dest = std::string apk_dest =
android::base::StringPrintf(where, android::base::Basename(argv[last_apk]).c_str()); "/data/local/tmp/" + android::base::Basename(argv[last_apk]);
if (use_fastdeploy == true) { if (use_fastdeploy == true) {
TemporaryFile metadataTmpFile; TemporaryFile metadataTmpFile;

2
adb/client/commandline.cpp
View file

@ -146,10 +146,8 @@ static void help() {
" install [-lrtsdg] [--instant] PACKAGE\n" " install [-lrtsdg] [--instant] PACKAGE\n"
" install-multiple [-lrtsdpg] [--instant] PACKAGE...\n" " install-multiple [-lrtsdpg] [--instant] PACKAGE...\n"
" push package(s) to the device and install them\n" " push package(s) to the device and install them\n"
" -l: forward lock application\n"
" -r: replace existing application\n" " -r: replace existing application\n"
" -t: allow test packages\n" " -t: allow test packages\n"
" -s: install application on sdcard\n"
" -d: allow version code downgrade (debuggable packages only)\n" " -d: allow version code downgrade (debuggable packages only)\n"
" -p: partial application install (install-multiple only)\n" " -p: partial application install (install-multiple only)\n"
" -g: grant all runtime permissions\n" " -g: grant all runtime permissions\n"