From 3c1803cab5d7f3777c81149170eca2199c25ed30 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 30 Mar 2020 17:38:37 -0700 Subject: [PATCH] adb: fix apex installation. Incremental doesn't support apex installation, but we were exiting instead of returning -1 to fall back to regular installation. Bug: http://b/151900478 Test: manual Change-Id: Id27009250090a65fbb45bb65fc39c1799bf1f861 --- adb/client/adb_install.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp index e4d010c71..092a86684 100644 --- a/adb/client/adb_install.cpp +++ b/adb/client/adb_install.cpp @@ -325,7 +325,12 @@ static int install_app_incremental(int argc, const char** argv, bool wait, bool } } - if (first_apk == -1) error_exit("Need at least one APK file on command line"); + if (first_apk == -1) { + if (!silent) { + fprintf(stderr, "error: need at least one APK file on command line\n"); + } + return -1; + } auto files = incremental::Files{argv + first_apk, argv + last_apk + 1}; if (silent) {