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

Commit 7c92b698 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:...

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

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



Change-Id: I3eba76e5313d759bf813461cdd53ddf1f58d7629
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d085caf2 9c4a46ca
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -21608,6 +21608,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.