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

Merge "Fixes incorrect system app deletion logic"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-11-29 22:33:29 +00:00
committed by Android (Google) Code Review
parent 7762547ce2 f7e31e6de7
commit b6005f9ee9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15246,7 +15246,8 @@ public class PackageManagerService extends IPackageManager.Stub
"inputs not balanced; missing argument for " + installPackageName);
}
final DeletePackageAction deletePackageAction;
if (prepareResult.replace) {
// we only want to try to delete for non system apps
if (prepareResult.replace && !prepareResult.system) {
deletePackageAction = mayDeletePackageLocked(res.removedInfo,
prepareResult.originalPs, prepareResult.disabledPs,
prepareResult.childPackageSettings);
@@ -17818,7 +17819,7 @@ public class PackageManagerService extends IPackageManager.Stub
return null;
}
if (isSystemApp(ps)) {
if (ps.parentPackageName == null) {
if (ps.parentPackageName != null) {
Slog.w(TAG, "Attempt to delete child system package " + ps.pkg.packageName);
return null;
}