diff options
| author | Oli Lan <olilan@google.com> | 2022-07-19 10:45:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-07 02:17:02 +0000 |
| commit | 4839c55056a0be7cb2f63434e76476a2fdf76911 (patch) | |
| tree | 1e787a0060082ed903da95ca2c3bb8d615858dab | |
| parent | aba6f0dc63aa188dee37a80f1a04121d84b47f72 (diff) | |
| download | base-4839c55056a0be7cb2f63434e76476a2fdf76911.tar.gz | |
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
(cherry picked from commit 49d8f9325a8d103497632097010899f87f403faa)
Merged-In: I7386d1ba3d61b95836b85c52214c83b216c478e8
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 10 |
1 files changed, 0 insertions, 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 9b0f1b7b7609..7a5b074acde2 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18685,16 +18685,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'. |