Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a21b2b7e authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Revert "Prevent non-admin users from deleting system apps."" into... 

Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7 am: bc227f01 am: 487c65ea am: 27d914f7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830



Change-Id: I175f671a34e871e1d0591e331081cec0b04d2ef4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8602c471 27d914f7

services/core/java/com/android/server/pm/PackageManagerService.java

+0 −10
Original line number Diff line number Diff line
@@ -21657,16 +21657,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.