diff options
| author | 2022-08-08 11:10:58 +0000 | |
|---|---|---|
| committer | 2022-08-08 11:10:58 +0000 | |
| commit | e910cac05ebe0d1acab1fe5f646fe4fcf33b780d (patch) | |
| tree | a0b4da6095653a5e6c0f6ee634bb663058b9d7dd | |
| parent | 85667c4bc82c7d493b03ecaa91556ed949a83e2f (diff) | |
| parent | 487c65ea5ddedf442f7ec0039696497de258b2f5 (diff) | |
Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830
Change-Id: I98fb8171d9a82a9850d6cb6881c58f5ea46bf4eb
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 59e74f36c744..f9c40a3eb68c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -21532,16 +21532,6 @@ public class PackageManagerService extends IPackageManager.Stub return PackageManager.DELETE_FAILED_INTERNAL_ERROR; } - if (isSystemApp(uninstalledPs)) { - UserInfo userInfo = mUserManager.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); // Static shared libs can be declared by any package, so let us not // allow removing a package if it provides a lib others depend on. |