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

Unverified Commit 17f77d49 authored by Oli Lan's avatar Oli Lan Committed by Kevin F. Haggerty
Browse files

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

This reverts commit 6c870e15.

Reason for revert: Regression, DELETE_SYSTEM_APP flag no longer works

Change-Id: Id3eb9e08a5404e88c39235d0d47337ed41bc6139
Merged-In: I4e959e296cca9bbdfc8fccc5e5e0e654ca524165
(cherry picked from commit d9089fbe)
Merged-In: Id3eb9e08a5404e88c39235d0d47337ed41bc6139
parent 0c648fbd

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

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