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

Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-30 18:33:40 +00:00
committed by Android (Google) Code Review
parent 658c53c47c a7621e0ce0
commit 6923c0d102
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

@@ -18690,6 +18690,16 @@ public class PackageManagerService extends IPackageManager.Stub
return PackageManager.DELETE_FAILED_INTERNAL_ERROR; return PackageManager.DELETE_FAILED_INTERNAL_ERROR;
} }
if (isSystemApp(uninstalledPs)) {
UserInfo userInfo = sUserManager.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);
// Save the enabled state before we delete the package. When deleting a stub // Save the enabled state before we delete the package. When deleting a stub
// application we always set the enabled state to 'disabled'. // application we always set the enabled state to 'disabled'.