diff options
| author | 2022-03-30 14:16:04 +0000 | |
|---|---|---|
| committer | 2022-03-30 14:16:04 +0000 | |
| commit | 15ab50ec29159407ed6adf84f13b60de25aca1fb (patch) | |
| tree | a7bce4d216c84e535b73fd5374f9137969c36be9 | |
| parent | 40a1fd6bbac145edf18cf753afbf58197b13fa7c (diff) | |
| parent | 6c870e157994519094e9e50ddf93e57a26779e22 (diff) | |
Prevent non-admin users from deleting system apps. am: 6c870e1579
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864
Change-Id: I40bc39502ae92a42aa44a6ed89fb4079aec52048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 73a3e87bb8a7..12765aa32e80 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18568,6 +18568,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); // Save the enabled state before we delete the package. When deleting a stub // application we always set the enabled state to 'disabled'. |