summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Buynytskyy <alexbuy@google.com>2024-01-08 20:25:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-01-08 20:25:39 +0000
commitc1be019b9d9b8ead7602966f8d866073fc3503f1 (patch)
tree4b5e8e7c9204c38ac2ee2770002214a6dfe23bc3
parentd6d4a0998033f8b94a2ea60e752b10a1ecacc590 (diff)
parentf5343e35dca94143852f65c0d76793b0a44552b9 (diff)
downloadbase-c1be019b9d9b8ead7602966f8d866073fc3503f1.tar.gz
Disallow system apps to be installed/updated as instant. am: 0d0f185c0d am: f5343e35dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716266 Change-Id: Ic4a04edaabbdab93a2af1a81ffc1846878ece65c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b640ef87a952..9f5b4a695467 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -16291,6 +16291,9 @@ public class PackageManagerService extends IPackageManager.Stub
if (pkgSetting == null) {
return PackageManager.INSTALL_FAILED_INVALID_URI;
}
+ if (instantApp && (pkgSetting.isSystem() || isUpdatedSystemApp(pkgSetting))) {
+ return PackageManager.INSTALL_FAILED_INVALID_URI;
+ }
if (!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