commit 469ec218f1adb5853c561abd9b9821063eb6e256
author Alex Buynytskyy <alexbuy@google.com> Mon Jan 08 02:07:36 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 08 02:07:36 2024 +0000
tree 9d1c87e2dcdc99a5b139982867995847e2ac3a10
parent cd3ccabc9d3a67b17a7791934df0d731af05d346
parent ed78735d17ee854471c39b6f940afefa835f6028

Disallow system apps to be installed/updated as instant. am: c61ee9f452 am: ed78735d17

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25715852

Change-Id: Ieeeccb05732c500930b7bf081622f36581d868a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/pm/InstallPackageHelper.java

diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 2597011..a56ac9d 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -559,6 +559,9 @@
                 if (pkgSetting == null) {
                     return PackageManager.INSTALL_FAILED_INVALID_URI;
                 }
+                if (instantApp && (pkgSetting.isSystem() || pkgSetting.isUpdatedSystemApp())) {
+                    return PackageManager.INSTALL_FAILED_INVALID_URI;
+                }
                 if (!snapshot.canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) {
                     // only allow the existing package to be used if it's installed as a full
                     // application for at least one user