Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d

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

Change-Id: I373e4063f297428a293b9b3ef2c75a1f502b646c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2022-08-08 11:11:35 +00:00
committed by Automerger Merge Worker
parent 5e52ac4e5f 487c65ea5d
commit 27d914f70a
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -21662,16 +21662,6 @@ public class PackageManagerService extends IPackageManager.Stub
return PackageManager.DELETE_FAILED_INTERNAL_ERROR; 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); disabledSystemPs = mSettings.getDisabledSystemPkgLPr(packageName);
// Static shared libs can be declared by any package, so let us not // 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. // allow removing a package if it provides a lib others depend on.