Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc2d608 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Removes ASEC-related install flags"

parents dc978cc1 24439442

adb/client/adb_install.cpp

+1 −11
Original line number Diff line number Diff line
@@ -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,

                              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");



    for (int i = 1; i < argc; i++) {

        if (!strcmp(argv[i], "-s")) {

            where = SD_DEST;

        }

    }



    // Find last APK argument.

    // All other arguments passed through verbatim.

    int last_apk = -1;
@@ -256,7 +246,7 @@ static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy, 
    int result = -1;

    std::vector<const char*> apk_file = {argv[last_apk]};

    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) {

        TemporaryFile metadataTmpFile;

adb/client/commandline.cpp

+0 −2
Original line number Diff line number Diff line
@@ -146,10 +146,8 @@ static void help() { 
        " install [-lrtsdg] [--instant] PACKAGE\n"

        " install-multiple [-lrtsdpg] [--instant] PACKAGE...\n"

        "     push package(s) to the device and install them\n"

        "     -l: forward lock application\n"

        "     -r: replace existing application\n"

        "     -t: allow test packages\n"

        "     -s: install application on sdcard\n"

        "     -d: allow version code downgrade (debuggable packages only)\n"

        "     -p: partial application install (install-multiple only)\n"

        "     -g: grant all runtime permissions\n"