From 505b8158f6c8c6c24c2fc947548da2519e6f5195 Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Tue, 8 Jan 2019 12:30:43 +0000
Subject: [PATCH] --apex implies --staged.

We only support installation of APEX files that require a reboot,
therefore we imply that an install session containing one apex is
necessarily a staged session.

Bug: 118865310
Test: atest apex_e2e_tests
Change-Id: Ib7adb91fc6d9d04f193695b9dfa7e03299047092
---
 .../com/android/server/pm/PackageManagerShellCommand.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 2e9d26a0a0cab..c9d298cc28c24 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -2293,9 +2293,7 @@ class PackageManagerShellCommand extends ShellCommand {
                     break;
                 case "--apex":
                     sessionParams.installFlags |= PackageManager.INSTALL_APEX;
-                    // TODO(b/118865310): APEX packages should always imply
-                    //                    sessionParams.isStaged(). Enforce this when the staged
-                    //                    install workflow is complete.
+                    sessionParams.setStaged();
                     break;
                 case "--multi-package":
                     sessionParams.setMultiPackage();