Merge "Always restart apps for full installs." into tm-dev

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 7c900ef9401a..37bfbb11948a 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -2837,6 +2837,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
             if (!stagedSplits.contains(null)) {
                 throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
                         "Full install must include a base package");
+            } else if ((params.installFlags & PackageManager.INSTALL_DONT_KILL_APP) != 0) {
+                EventLog.writeEvent(0x534e4554, "219044664");
+
+                // Installing base.apk. Make sure the app is restarted.
+                params.setDontKillApp(false);
             }
             if (baseApk.isSplitRequired() && (stagedSplits.size() <= 1
                     || !stagedSplitTypes.containsAll(requiredSplitTypes))) {