diff options
| author | 2022-08-08 10:38:18 +0000 | |
|---|---|---|
| committer | 2022-08-08 10:38:18 +0000 | |
| commit | cf5587d2ca4aa18957e978c8f7792f6aae0fa191 (patch) | |
| tree | 7482767a8a13b8d85a0b78fe4aaaae1b6f217b59 | |
| parent | e0243c7661416b738f61126ebc6d2f598083fa40 (diff) | |
| parent | 49d8f9325a8d103497632097010899f87f403faa (diff) | |
Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226
Change-Id: I25f5944fcf0d975ab8f202e5701ea28b681544f2
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.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 3ce0f6849678..7f6f729da541 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18729,16 +18729,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'. |