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

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

Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f932 

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



Change-Id: I25f5944fcf0d975ab8f202e5701ea28b681544f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0243c76 49d8f932

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

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