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

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

Prevent non-admin users from deleting system apps. am: 6c870e15 am: 15ab50ec am: d719add2 

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



Change-Id: I8f57f2990d6c1e2b0f52331bf6f7d1663cf66ad1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eba9a7f0 d719add2

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

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