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

Prevent non-admin users from deleting system apps. am: 6c870e1579 am: 15ab50ec29

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

Change-Id: Ie4d1088736fb3f99d8f8a20c9cf1e8eb87a674cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2022-03-30 14:33:58 +00:00
committed by Automerger Merge Worker
parent 65897f0efc 15ab50ec29
commit d719add201
1 changed files with 10 additions and 0 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

@@ -21532,6 +21532,16 @@ 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.