summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-28 03:21:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-28 03:21:01 +0000
commit384b8dd4e4f27dcabf708ea2355fef164f7f7061 (patch)
treed6eb93e49a23d948c6708d4d7f9f4bf030e82a7b
parent9854e5d1fb482df89f65b24f18d99f0eafb59f22 (diff)
parentb44f1fa8ae6f717510217c7c27887048eedab25a (diff)
Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392 Change-Id: I9ff874b8410d0e56201b1952a4130213a341e5a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/PackageInstallerSession.java5
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))) {