From a2f3f9558f222c72d4847c1b3ac922f97c9105d3 Mon Sep 17 00:00:00 2001 From: Dario Freni Date: Tue, 29 Jan 2019 14:17:05 +0000 Subject: [PATCH] Fix: Propagate cmd args to multi-package sessions. Test: adb install-multi-package --staged file1.apk file2.apk. Verified that --staged is propagated. Bug: 118865310 Change-Id: I59cd5c49b4a60ab7bf7481732cd3bd3205820d7a --- adb/client/adb_install.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp index 386994577..2bf292436 100644 --- a/adb/client/adb_install.cpp +++ b/adb/client/adb_install.cpp @@ -550,6 +550,10 @@ int install_multi_package(int argc, const char** argv) { std::string multi_package_cmd = android::base::StringPrintf("%s install-create --multi-package", install_cmd.c_str()); + for (int i = 1; i < first_package; i++) { + multi_package_cmd += " " + escape_arg(argv[i]); + } + if (apex_found) { multi_package_cmd += " --staged"; }