summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2024-01-07 16:45:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-07 16:45:27 +0000
commitabf53e4438c627ef3cbbc3d5adab601c42e76185 (patch)
treeff9ce354df9f18ef1de2e50e5fec582640e77746
parentc73060b58ff801d49a3bbf12a18d22ea4238c6c2 (diff)
parent4c390bd2a7d31a6c08c4fac407cbc2ecdcade849 (diff)
Merge "Disallow system apps to be installed/updated as instant." into udc-dev am: 4c390bd2a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25715830 Change-Id: I7e5134553e0f84531468482007b3ac9f85b8da3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/InstallPackageHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 622cb6609630..d0304b43215e 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -668,6 +668,9 @@ final class InstallPackageHelper {
if (pkgSetting == null || pkgSetting.getPkg() == null) {
return Pair.create(PackageManager.INSTALL_FAILED_INVALID_URI, intentSender);
}
+ if (instantApp && (pkgSetting.isSystem() || pkgSetting.isUpdatedSystemApp())) {
+ return Pair.create(PackageManager.INSTALL_FAILED_INVALID_URI, intentSender);
+ }
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