summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-07 02:25:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-07 02:25:32 +0000
commit6b379b26d862d900ff10ef5e9d037fff0626cb56 (patch)
tree679f544efe37a33878aaf4e7bbfd558b823bd655
parent2090acecf3d55d4a344e21912f8862c973de5a09 (diff)
parent1eaf2c28e84f5adaa41efc615484a5d4d021e89b (diff)
downloadbase-6b379b26d862d900ff10ef5e9d037fff0626cb56.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25715852'] into tm-platform-release.
Change-Id: Iad938e7d40805a522e7153fb9b320e88aa7e30d2
-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 259701166147..a56ac9de6ebe 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 @@ final class InstallPackageHelper {
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