From 49d8f9325a8d103497632097010899f87f403faa Mon Sep 17 00:00:00 2001 From: Oli Lan Date: Tue, 19 Jul 2022 10:45:22 +0000 Subject: Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." This reverts commit a7621e0ce00f1d140b375518e26cf75693314203. Reason for revert: Regression, DELETE_SYSTEM_APP flag no longer works Change-Id: I7386d1ba3d61b95836b85c52214c83b216c478e8 --- .../core/java/com/android/server/pm/PackageManagerService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3549db429758..b2e88c23e8c4 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18690,16 +18690,6 @@ public class PackageManagerService extends IPackageManager.Stub return PackageManager.DELETE_FAILED_INTERNAL_ERROR; } - if (isSystemApp(uninstalledPs)) { - UserInfo userInfo = sUserManager.getUserInfo(userId); - if (userInfo == null || !userInfo.isAdmin()) { - Slog.w(TAG, "Not removing package " + packageName - + " as only admin user may downgrade system apps"); - EventLog.writeEvent(0x534e4554, "170646036", -1, packageName); - return PackageManager.DELETE_FAILED_USER_RESTRICTED; - } - } - disabledSystemPs = mSettings.getDisabledSystemPkgLPr(packageName); // Save the enabled state before we delete the package. When deleting a stub // application we always set the enabled state to 'disabled'. -- cgit v1.2.3-59-g8ed1b